@dreb/coding-agent 2.34.2 → 2.35.0

package/dist/core/agent-session.js

@@ -581,6 +581,7 @@ export class AgentSession {
                 agentId,
                 agentType: result.agent,
                 success: result.exitCode === 0,
+                sessionFile: result.sessionFile,
             });
         }
         catch (emitErr) {
@@ -716,13 +717,13 @@ export class AgentSession {
             const messageText = this._getUserMessageText(event.message);
             if (messageText) {
                 // Check steering queue first
-                const steeringIndex = this._steeringMessages.indexOf(messageText);
+                const steeringIndex = this._steeringMessages.findIndex((message) => message.text === messageText);
                 if (steeringIndex !== -1) {
                     this._steeringMessages.splice(steeringIndex, 1);
                 }
                 else {
                     // Check follow-up queue
-                    const followUpIndex = this._followUpMessages.indexOf(messageText);
+                    const followUpIndex = this._followUpMessages.findIndex((message) => message.text === messageText);
                     if (followUpIndex !== -1) {
                         this._followUpMessages.splice(followUpIndex, 1);
                     }
@@ -1389,7 +1390,7 @@ export class AgentSession {
      * Internal: Queue a steering message (already expanded, no extension command check).
      */
     async _queueSteer(text, images) {
-        this._steeringMessages.push(text);
+        this._steeringMessages.push({ text, images: images ? [...images] : undefined });
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
@@ -1404,7 +1405,7 @@ export class AgentSession {
      * Internal: Queue a follow-up message (already expanded, no extension command check).
      */
     async _queueFollowUp(text, images) {
-        this._followUpMessages.push(text);
+        this._followUpMessages.push({ text, images: images ? [...images] : undefined });
         const content = [{ type: "text", text }];
         if (images) {
             content.push(...images);
@@ -1513,23 +1514,39 @@ export class AgentSession {
      * @returns Object with steering and followUp arrays
      */
     clearQueue() {
-        const steering = [...this._steeringMessages];
-        const followUp = [...this._followUpMessages];
+        const steeringMessages = this._steeringMessages.map((message) => ({
+            text: message.text,
+            images: message.images ? [...message.images] : undefined,
+        }));
+        const followUpMessages = this._followUpMessages.map((message) => ({
+            text: message.text,
+            images: message.images ? [...message.images] : undefined,
+        }));
+        const steering = steeringMessages.map((message) => message.text);
+        const followUp = followUpMessages.map((message) => message.text);
         this._steeringMessages = [];
         this._followUpMessages = [];
         this.agent.clearAllQueues();
-        return { steering, followUp };
+        return { steering, followUp, steeringMessages, followUpMessages };
     }
     /** Number of pending messages (includes both steering and follow-up) */
     get pendingMessageCount() {
         return this._steeringMessages.length + this._followUpMessages.length;
     }
-    /** Get pending steering messages (read-only) */
+    /** Get pending steering message text (read-only compatibility view). */
     getSteeringMessages() {
-        return this._steeringMessages;
+        return this._steeringMessages.map((message) => message.text);
     }
-    /** Get pending follow-up messages (read-only) */
+    /** Get pending follow-up message text (read-only compatibility view). */
     getFollowUpMessages() {
+        return this._followUpMessages.map((message) => message.text);
+    }
+    /** Get full pending steering payloads, including inline image attachments. */
+    getSteeringMessagePayloads() {
+        return this._steeringMessages;
+    }
+    /** Get full pending follow-up payloads, including inline image attachments. */
+    getFollowUpMessagePayloads() {
         return this._followUpMessages;
     }
     get resourceLoader() {
@@ -2274,7 +2291,7 @@ export class AgentSession {
                 this.sessionManager.appendCustomEntry(customType, data);
             },
             setSessionName: (name) => {
-                this.sessionManager.appendSessionInfo(name);
+                this.setSessionName(name);
             },
             getSessionName: () => {
                 return this.sessionManager.getSessionName();
@@ -2446,12 +2463,15 @@ export class AgentSession {
                     parentSessionFile: () => this.sessionFile,
                     modelRegistry: this._modelRegistry,
                     getAgentModelsForAgent: (name) => this.settingsManager?.getAgentModelsForAgent(name),
-                    onBackgroundStart: (agentId, agentType, taskSummary) => {
-                        this._emit({ type: "background_agent_start", agentId, agentType, taskSummary });
+                    onBackgroundStart: (agentId, agentType, taskSummary, sessionDir) => {
+                        this._emit({ type: "background_agent_start", agentId, agentType, taskSummary, sessionDir });
                     },
                     onBackgroundComplete: (agentId, result, cancelled) => {
                         this._handleBackgroundComplete(agentId, result, cancelled);
                     },
+                    onBackgroundEvent: (agentId, event) => {
+                        this._emit({ type: "background_agent_event", agentId, event });
+                    },
                 },
             });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
@@ -2811,6 +2831,7 @@ export class AgentSession {
      */
     setSessionName(name) {
         this.sessionManager.appendSessionInfo(name);
+        this._emit({ type: "session_name_changed", name: this.sessionName ?? "" });
     }
     /**
      * Create a fork from a specific entry.
@@ -2879,6 +2900,16 @@ export class AgentSession {
      * @returns Result with editorText (if user message) and cancelled status
      */
     async navigateTree(targetId, options = {}) {
+        // Navigating mid-stream would replace agent messages during an active run,
+        // corrupting the conversation state. Fail loudly instead.
+        if (this.isStreaming) {
+            throw new Error("Cannot navigate the session tree while the agent is streaming. Abort or wait for idle first.");
+        }
+        // A second concurrent navigation (or a compaction) would clobber the shared branch-summary
+        // abort controller and interleave tree mutations. Fail loudly instead.
+        if (this.isCompacting) {
+            throw new Error("Cannot navigate the session tree while summarization or compaction is in progress. Wait for idle first.");
+        }
         const oldLeafId = this.sessionManager.getLeafId();
         // No-op if already at target
         if (targetId === oldLeafId) {
@@ -2908,133 +2939,144 @@ export class AgentSession {
             replaceInstructions,
             label,
         };
-        // Set up abort controller for summarization
+        // Set up abort controller for summarization. Cleared in the finally below on every
+        // exit path (throws, cancel returns, summary abort, success) so isCompacting cannot
+        // be left wedged true after an early exit.
         this._branchSummaryAbortController = new AbortController();
-        let extensionSummary;
-        let fromExtension = false;
-        // Emit session_before_tree event
-        if (this._extensionRunner?.hasHandlers("session_before_tree")) {
-            const result = (await this._extensionRunner.emit({
-                type: "session_before_tree",
-                preparation,
-                signal: this._branchSummaryAbortController.signal,
-            }));
-            if (result?.cancel) {
-                return { cancelled: true };
-            }
-            if (result?.summary && options.summarize) {
-                extensionSummary = result.summary;
-                fromExtension = true;
+        try {
+            let extensionSummary;
+            let fromExtension = false;
+            // Emit session_before_tree event
+            if (this._extensionRunner?.hasHandlers("session_before_tree")) {
+                const result = (await this._extensionRunner.emit({
+                    type: "session_before_tree",
+                    preparation,
+                    signal: this._branchSummaryAbortController.signal,
+                }));
+                if (result?.cancel) {
+                    return { cancelled: true };
+                }
+                if (result?.summary && options.summarize) {
+                    extensionSummary = result.summary;
+                    fromExtension = true;
+                }
+                // Allow extensions to override instructions and label
+                if (result?.customInstructions !== undefined) {
+                    customInstructions = result.customInstructions;
+                }
+                if (result?.replaceInstructions !== undefined) {
+                    replaceInstructions = result.replaceInstructions;
+                }
+                if (result?.label !== undefined) {
+                    label = result.label;
+                }
             }
-            // Allow extensions to override instructions and label
-            if (result?.customInstructions !== undefined) {
-                customInstructions = result.customInstructions;
+            // Run default summarizer if needed
+            let summaryText;
+            let summaryDetails;
+            if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
+                const model = this.model;
+                const apiKey = await this._modelRegistry.getApiKey(model);
+                if (!apiKey) {
+                    throw new Error(`No API key for ${model.provider}`);
+                }
+                const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
+                const result = await generateBranchSummary(entriesToSummarize, {
+                    model,
+                    apiKey,
+                    signal: this._branchSummaryAbortController.signal,
+                    customInstructions,
+                    replaceInstructions,
+                    reserveTokens: branchSummarySettings.reserveTokens,
+                });
+                if (result.aborted) {
+                    return { cancelled: true, aborted: true };
+                }
+                if (result.error) {
+                    throw new Error(result.error);
+                }
+                summaryText = result.summary;
+                summaryDetails = {
+                    readFiles: result.readFiles || [],
+                    modifiedFiles: result.modifiedFiles || [],
+                };
+            }
+            else if (extensionSummary) {
+                summaryText = extensionSummary.summary;
+                summaryDetails = extensionSummary.details;
+            }
+            // Re-check after extension/summarization awaits: prompt dispatch can start streaming
+            // while we yielded (same race class guarded in the prompt path), and the mutation
+            // block below must not replace messages during an active run.
+            if (this.isStreaming) {
+                throw new Error("Cannot navigate the session tree while the agent is streaming. Abort or wait for idle first.");
+            }
+            // Determine the new leaf position based on target type
+            let newLeafId;
+            let editorText;
+            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);
+            }
+            else if (targetEntry.type === "custom_message") {
+                // Custom message: leaf = parent (null if root), text goes to editor
+                newLeafId = targetEntry.parentId;
+                editorText =
+                    typeof targetEntry.content === "string"
+                        ? targetEntry.content
+                        : targetEntry.content
+                            .filter((c) => c.type === "text")
+                            .map((c) => c.text)
+                            .join("");
             }
-            if (result?.replaceInstructions !== undefined) {
-                replaceInstructions = result.replaceInstructions;
+            else {
+                // Non-user message: leaf = selected node
+                newLeafId = targetId;
+            }
+            // Switch leaf (with or without summary)
+            // Summary is attached at the navigation target position (newLeafId), not the old branch
+            let summaryEntry;
+            if (summaryText) {
+                // Create summary at target position (can be null for root)
+                const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
+                summaryEntry = this.sessionManager.getEntry(summaryId);
+                // Attach label to the summary entry
+                if (label) {
+                    this.sessionManager.appendLabelChange(summaryId, label);
+                }
             }
-            if (result?.label !== undefined) {
-                label = result.label;
+            else if (newLeafId === null) {
+                // No summary, navigating to root - reset leaf
+                this.sessionManager.resetLeaf();
             }
-        }
-        // Run default summarizer if needed
-        let summaryText;
-        let summaryDetails;
-        if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
-            const model = this.model;
-            const apiKey = await this._modelRegistry.getApiKey(model);
-            if (!apiKey) {
-                throw new Error(`No API key for ${model.provider}`);
-            }
-            const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
-            const result = await generateBranchSummary(entriesToSummarize, {
-                model,
-                apiKey,
-                signal: this._branchSummaryAbortController.signal,
-                customInstructions,
-                replaceInstructions,
-                reserveTokens: branchSummarySettings.reserveTokens,
-            });
-            this._branchSummaryAbortController = undefined;
-            if (result.aborted) {
-                return { cancelled: true, aborted: true };
+            else {
+                // No summary, navigating to non-root
+                this.sessionManager.branch(newLeafId);
             }
-            if (result.error) {
-                throw new Error(result.error);
+            // Attach label to target entry when not summarizing (no summary entry to label)
+            if (label && !summaryText) {
+                this.sessionManager.appendLabelChange(targetId, label);
             }
-            summaryText = result.summary;
-            summaryDetails = {
-                readFiles: result.readFiles || [],
-                modifiedFiles: result.modifiedFiles || [],
-            };
-        }
-        else if (extensionSummary) {
-            summaryText = extensionSummary.summary;
-            summaryDetails = extensionSummary.details;
-        }
-        // Determine the new leaf position based on target type
-        let newLeafId;
-        let editorText;
-        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);
-        }
-        else if (targetEntry.type === "custom_message") {
-            // Custom message: leaf = parent (null if root), text goes to editor
-            newLeafId = targetEntry.parentId;
-            editorText =
-                typeof targetEntry.content === "string"
-                    ? targetEntry.content
-                    : targetEntry.content
-                        .filter((c) => c.type === "text")
-                        .map((c) => c.text)
-                        .join("");
-        }
-        else {
-            // Non-user message: leaf = selected node
-            newLeafId = targetId;
-        }
-        // Switch leaf (with or without summary)
-        // Summary is attached at the navigation target position (newLeafId), not the old branch
-        let summaryEntry;
-        if (summaryText) {
-            // Create summary at target position (can be null for root)
-            const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
-            summaryEntry = this.sessionManager.getEntry(summaryId);
-            // Attach label to the summary entry
-            if (label) {
-                this.sessionManager.appendLabelChange(summaryId, label);
+            // Update agent state
+            const sessionContext = this.sessionManager.buildSessionContext();
+            this.agent.replaceMessages(sessionContext.messages);
+            // Emit session_tree event
+            if (this._extensionRunner) {
+                await this._extensionRunner.emit({
+                    type: "session_tree",
+                    newLeafId: this.sessionManager.getLeafId(),
+                    oldLeafId,
+                    summaryEntry,
+                    fromExtension: summaryText ? fromExtension : undefined,
+                });
             }
+            // Emit to custom tools
+            return { editorText, cancelled: false, summaryEntry };
         }
-        else if (newLeafId === null) {
-            // No summary, navigating to root - reset leaf
-            this.sessionManager.resetLeaf();
-        }
-        else {
-            // No summary, navigating to non-root
-            this.sessionManager.branch(newLeafId);
-        }
-        // Attach label to target entry when not summarizing (no summary entry to label)
-        if (label && !summaryText) {
-            this.sessionManager.appendLabelChange(targetId, label);
-        }
-        // Update agent state
-        const sessionContext = this.sessionManager.buildSessionContext();
-        this.agent.replaceMessages(sessionContext.messages);
-        // Emit session_tree event
-        if (this._extensionRunner) {
-            await this._extensionRunner.emit({
-                type: "session_tree",
-                newLeafId: this.sessionManager.getLeafId(),
-                oldLeafId,
-                summaryEntry,
-                fromExtension: summaryText ? fromExtension : undefined,
-            });
+        finally {
+            this._branchSummaryAbortController = undefined;
         }
-        // Emit to custom tools
-        this._branchSummaryAbortController = undefined;
-        return { editorText, cancelled: false, summaryEntry };
     }
     /**
      * Get all user messages from session for fork selector.