@dyyz1993/pi-coding-agent 0.69.12 → 0.69.14

package/dist/core/agent-session.js

@@ -292,24 +292,21 @@ export class AgentSession {
                 }
             }
         }
-        // Emit to extensions first
-        await this._emitExtensionEvent(event);
-        // Notify all listeners
-        this._emit(event);
-        // Handle session persistence
+        // Handle session persistence BEFORE emitting for message_end,
+        // so we can inject the entry ID into the event for RPC clients.
         if (event.type === "message_end") {
-            // Check if this is a custom message from extensions
+            let entryId;
             if (event.message.role === "custom") {
-                // Persist as CustomMessageEntry
-                this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
+                entryId = this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
             }
             else if (event.message.role === "user" ||
                 event.message.role === "assistant" ||
                 event.message.role === "toolResult") {
-                // Regular LLM message - persist as SessionMessageEntry
-                this.sessionManager.appendMessage(event.message);
+                entryId = this.sessionManager.appendMessage(event.message);
+            }
+            if (entryId) {
+                event.entryId = entryId;
             }
-            // Other message types (bashExecution, compactionSummary, branchSummary) are persisted elsewhere
             // Track assistant message for auto-compaction (checked on agent_end)
             if (event.message.role === "assistant") {
                 this._lastAssistantMessage = event.message;
@@ -329,6 +326,10 @@ export class AgentSession {
                 }
             }
         }
+        // Emit to extensions first
+        await this._emitExtensionEvent(event);
+        // Notify all listeners
+        this._emit(event);
         // Check auto-retry and auto-compaction after agent completes
         if (event.type === "agent_end" && this._lastAssistantMessage) {
             const msg = this._lastAssistantMessage;
@@ -418,6 +419,7 @@ export class AgentSession {
             const extensionEvent = {
                 type: "message_end",
                 message: event.message,
+                entryId: event.entryId,
             };
             await this._extensionRunner.emit(extensionEvent);
         }