@junctionpanel/server 0.1.92 → 0.1.94

package/dist/server/server/agent/agent-manager.js

@@ -888,6 +888,7 @@ export class AgentManager {
             text,
             messageId: normalizedMessageId,
             ...(options?.images?.length ? { images: options.images.map((image) => ({ ...image })) } : {}),
+            ...(options?.deliveryState ? { deliveryState: options.deliveryState } : {}),
         };
         const updatedAt = this.touchUpdatedAt(agent);
         agent.lastUserMessageAt = updatedAt;
@@ -907,6 +908,7 @@ export class AgentManager {
     }
     async appendTimelineItem(agentId, item) {
         const agent = this.requireAgent(agentId);
+        const previousPendingPlanReviewFingerprint = this.getCurrentPendingPlanReviewFingerprint(agent);
         this.touchUpdatedAt(agent);
         const row = this.recordTimeline(agent, item);
         this.dispatchStream(agentId, {
@@ -917,6 +919,10 @@ export class AgentManager {
             seq: row.seq,
             epoch: this.ensureTimelineState(agent).epoch,
         });
+        if (item.type !== "user_message" &&
+            this.didPendingPlanReviewFingerprintChange(agent, previousPendingPlanReviewFingerprint)) {
+            this.emitState(agent);
+        }
         await this.persistSnapshot(agent);
     }
     async emitLiveTimelineItem(agentId, item) {
@@ -1680,34 +1686,44 @@ export class AgentManager {
                 }
                 break;
             case "timeline":
-                // Skip provider-replayed user_message items during history hydration.
-                // These are already canonically recorded by recordUserMessage() and replaying them would
-                // create duplicates. Match by messageId (not text) to avoid dropping legitimate
-                // provider-origin messages that happen to reuse the same text.
-                if (options?.fromHistory &&
-                    event.item.type === "user_message") {
-                    const eventMessageId = normalizeMessageId(event.item.messageId);
-                    if (eventMessageId) {
-                        const canonicalText = options?.canonicalUserMessagesById?.get(eventMessageId);
-                        if (canonicalText === event.item.text) {
-                            break;
+                {
+                    const previousPendingPlanReviewFingerprint = !options?.fromHistory
+                        ? this.getCurrentPendingPlanReviewFingerprint(agent)
+                        : null;
+                    // Skip provider-replayed user_message items during history hydration.
+                    // These are already canonically recorded by recordUserMessage() and replaying them would
+                    // create duplicates. Match by messageId (not text) to avoid dropping legitimate
+                    // provider-origin messages that happen to reuse the same text.
+                    if (options?.fromHistory &&
+                        event.item.type === "user_message") {
+                        const eventMessageId = normalizeMessageId(event.item.messageId);
+                        if (eventMessageId) {
+                            const canonicalText = options?.canonicalUserMessagesById?.get(eventMessageId);
+                            if (canonicalText === event.item.text) {
+                                break;
+                            }
                         }
                     }
-                }
-                if (this.shouldSuppressLiveUserMessageEcho(agent, event, options)) {
-                    break;
-                }
-                timelineRow = this.recordTimeline(agent, event.item);
-                shouldPersistSnapshot = true;
-                if (!options?.fromHistory &&
-                    event.item.type === "user_message") {
-                    agent.lastUserMessageAt = new Date();
-                    this.emitState(agent);
-                }
-                if (!options?.fromHistory &&
-                    event.item.type !== "permission_request" &&
-                    event.item.type !== "permission_resolution") {
-                    this.touchActiveHarnessRunProgress(agent);
+                    if (this.shouldSuppressLiveUserMessageEcho(agent, event, options)) {
+                        break;
+                    }
+                    timelineRow = this.recordTimeline(agent, event.item);
+                    shouldPersistSnapshot = true;
+                    if (!options?.fromHistory &&
+                        event.item.type === "user_message") {
+                        agent.lastUserMessageAt = new Date();
+                        this.emitState(agent);
+                    }
+                    if (!options?.fromHistory &&
+                        event.item.type !== "permission_request" &&
+                        event.item.type !== "permission_resolution") {
+                        this.touchActiveHarnessRunProgress(agent);
+                    }
+                    if (!options?.fromHistory &&
+                        event.item.type !== "user_message" &&
+                        this.didPendingPlanReviewFingerprintChange(agent, previousPendingPlanReviewFingerprint)) {
+                        this.emitState(agent);
+                    }
                 }
                 break;
             case "turn_completed":
@@ -2097,12 +2113,14 @@ export class AgentManager {
         if (agent.internal) {
             return;
         }
-        // Skip if already requires attention
-        if (agent.attention.requiresAttention) {
-            return;
-        }
+        const existingAttentionReason = agent.attention.requiresAttention
+            ? agent.attention.attentionReason
+            : null;
         // Check if agent entered error state
-        if (previousStatus !== "error" && currentStatus === "error") {
+        if (currentStatus === "error") {
+            if (existingAttentionReason === "error" || previousStatus === "error") {
+                return;
+            }
             this.pendingUserInterruptAgents.delete(agent.id);
             this.userInterruptedAgents.delete(agent.id);
             this.suppressedPermissionAttentionKeys.delete(agent.id);
@@ -2125,6 +2143,10 @@ export class AgentManager {
             if (this.suppressedPermissionAttentionKeys.get(agent.id) === currentPermissionAttentionKey) {
                 return;
             }
+            if (agent.attention.requiresAttention &&
+                (existingAttentionReason === "permission" || existingAttentionReason === "error")) {
+                return;
+            }
             this.suppressedPermissionAttentionKeys.delete(agent.id);
             agent.attention = {
                 requiresAttention: true,
@@ -2187,6 +2209,16 @@ export class AgentManager {
         }
         this.suppressedPermissionAttentionKeys.delete(agent.id);
     }
+    getCurrentPendingPlanReviewFingerprint(agent) {
+        return getPendingPlanReviewFingerprint({
+            pendingPermissions: agent.pendingPermissions,
+            timelineRows: agent.timelineRows,
+            lifecycle: agent.lifecycle,
+        });
+    }
+    didPendingPlanReviewFingerprintChange(agent, previousFingerprint) {
+        return this.getCurrentPendingPlanReviewFingerprint(agent) !== previousFingerprint;
+    }
     enqueueBackgroundPersist(agent) {
         this.enqueueBackgroundPersistById(agent.id);
     }