@dyyz1993/pi-coding-agent 0.74.36 → 0.74.40

package/dist/core/agent-session.js

@@ -769,12 +769,9 @@ export class AgentSession {
             this.setActiveToolsByName(agent.tools);
         }
         if (agent.systemPrompt) {
-            const appendParts = [];
-            if (this._resourceLoader.getAppendSystemPrompt().length > 0) {
-                appendParts.push(...this._resourceLoader.getAppendSystemPrompt());
-            }
-            appendParts.push(agent.systemPrompt);
-            this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+            // Rebuild base prompt with filtered tools, then append agent-specific prompt
+            this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames()) + "\n\n" + agent.systemPrompt;
+            this.agent.state.systemPrompt = this._baseSystemPrompt;
         }
     }
     getCurrentAgent() {
@@ -2528,18 +2525,20 @@ export class AgentSession {
                 // Non-user message: leaf = selected node
                 newLeafId = targetId;
             }
-            // Safety guard: reject navigation that would eliminate ALL user messages.
-            // The new leaf path is root → ... → newLeafId (or null for root reset).
-            // If a summary is provided, it will be a child of newLeafId, so the effective
-            // leaf path includes newLeafId's ancestors. Check both cases.
-            const effectiveLeafId = summaryText ? newLeafId : newLeafId;
-            const userMsgCount = this.sessionManager.countUserMessagesOnPath(effectiveLeafId);
-            if (userMsgCount === 0) {
-                return {
-                    cancelled: true,
-                    editorText: undefined,
-                    reason: `Navigation to "${targetId}" would remove all user messages from the active path. This likely means the target is before the first user message. Use file-level rollback (snapshot.rollback) instead.`,
-                };
+            // Safety guard: reject navigation that would eliminate ALL user messages
+            // ONLY when file rollback is involved (skipFiles !== true).
+            // When skipFiles=true (message-only rollback), going back to empty is valid —
+            // the user wants to undo their mistaken message.
+            if (options.skipFiles !== true) {
+                const effectiveLeafId = summaryText ? newLeafId : newLeafId;
+                const userMsgCount = this.sessionManager.countUserMessagesOnPath(effectiveLeafId);
+                if (userMsgCount === 0) {
+                    return {
+                        cancelled: true,
+                        editorText: undefined,
+                        reason: `Navigation to "${targetId}" would remove all user messages and restore files to their pre-session state. Use message-only rollback (skipFiles: true) to undo without file changes.`,
+                    };
+                }
             }
             // Switch leaf (with or without summary)
             // Summary is attached at the navigation target position (newLeafId), not the old branch