@memberjunction/core-entities 6.2.0-edge.4 → 6.2.0-edge.5

package/dist/engines/conversations.js

@@ -44,14 +44,20 @@ function sameId(a, b) {
  * Helper: parse a raw ConversationDetailComplete row into typed arrays.
  */
 export function ParseConversationDetailComplete(queryResult) {
+    const rawArtifacts = queryResult.ArtifactsJSON
+        ? JSON.parse(queryResult.ArtifactsJSON)
+        : [];
+    const artifacts = rawArtifacts.slice().sort((a, b) => {
+        const aTime = ToEpochMs(a.VersionCreatedAt) ?? ToEpochMs(a.__mj_CreatedAt) ?? 0;
+        const bTime = ToEpochMs(b.VersionCreatedAt) ?? ToEpochMs(b.__mj_CreatedAt) ?? 0;
+        return aTime - bTime;
+    });
     return {
         ...queryResult,
         agentRuns: queryResult.AgentRunsJSON
             ? JSON.parse(queryResult.AgentRunsJSON)
             : [],
-        artifacts: queryResult.ArtifactsJSON
-            ? JSON.parse(queryResult.ArtifactsJSON)
-            : [],
+        artifacts,
         ratings: queryResult.RatingsJSON
             ? JSON.parse(queryResult.RatingsJSON)
             : []
@@ -113,12 +119,63 @@ function detailIdInFilter(detailIds) {
 function idInFilter(ids) {
     return `ID IN (${quoteIdList(ids)})`;
 }
-/** Keys agent runs by the detail they belong to. */
+/**
+ * Priority tier for choosing which `AIAgentRun` represents a `ConversationDetail` in the UI
+ * (gear icon -> "View Agent Run", token/cost stats, duration):
+ * - Tier 0: Root primary orchestrating run (`ParentRunID == null` and `ContinuationDepth == 0`)
+ * - Tier 1: Root post-workflow continuation synthesis run (`ParentRunID == null` and `ContinuationDepth > 0`)
+ * - Tier 2: Child / sub-agent run (`ParentRunID != null`)
+ */
+function agentRunPriorityTier(run) {
+    if (run.ParentRunID) {
+        return 2;
+    }
+    return (run.ContinuationDepth ?? 0) > 0 ? 1 : 0;
+}
+/**
+ * Returns true when `candidate` should replace `existing` as the representative agent run
+ * for a single `ConversationDetailID`. Lower tier wins (primary root run beats continuation
+ * synthesis run, which beats child sub-agent run); within the same tier, a strictly newer run
+ * wins (so user retries of a message replace the earlier run while DESC-ordered queries keep
+ * the first row when timestamps are tied or omitted in test fixtures).
+ */
+export function ShouldReplaceDetailAgentRun(existing, candidate) {
+    if (!existing) {
+        return true;
+    }
+    if (existing.ID && candidate.ID && UUIDsEqual(existing.ID, candidate.ID)) {
+        return true;
+    }
+    const existingTier = agentRunPriorityTier(existing);
+    const candidateTier = agentRunPriorityTier(candidate);
+    if (candidateTier !== existingTier) {
+        return candidateTier < existingTier;
+    }
+    const existingTime = ToEpochMs(existing.__mj_CreatedAt ?? existing.StartedAt) ?? 0;
+    const candidateTime = ToEpochMs(candidate.__mj_CreatedAt ?? candidate.StartedAt) ?? 0;
+    if (candidateTime !== existingTime) {
+        return candidateTime > existingTime;
+    }
+    return false;
+}
+function selectPreferredDetailAgentRun(runs) {
+    let best;
+    for (const run of runs) {
+        if (ShouldReplaceDetailAgentRun(best, run)) {
+            best = run;
+        }
+    }
+    return best;
+}
+/** Keys agent runs by the detail they belong to, preferring the primary root orchestrating run. */
 function groupAgentRunsByDetailId(runs) {
     const byDetailId = new Map();
     for (const run of runs) {
         if (run.ConversationDetailID) {
-            byDetailId.set(run.ConversationDetailID, run);
+            const existing = byDetailId.get(run.ConversationDetailID);
+            if (ShouldReplaceDetailAgentRun(existing, run)) {
+                byDetailId.set(run.ConversationDetailID, run);
+            }
         }
     }
     return byDetailId;
@@ -1036,14 +1093,29 @@ export class ConversationEngine extends BaseEngine {
                 throw new Error('Conversation not found');
             }
         }
+        const previousValues = {};
+        for (const key of Object.keys(updates)) {
+            previousValues[key] = conversation[key];
+        }
         this.mergeDataOntoRecord(conversation, updates);
+        // Emit immediately after mutating the shared cached entity so Angular subscribers
+        // (e.g. ConversationListComponent) run change detection synchronously rather than
+        // seeing an uncommitted mutation during the async Save() round-trip (NG0100).
+        this._conversations$.next([...this._conversations$.value]);
         this._selfMutating = true;
         try {
             const saved = await conversation.Save();
             if (!saved) {
+                this.mergeDataOntoRecord(conversation, previousValues);
+                this._conversations$.next([...this._conversations$.value]);
                 throw new Error(conversation.LatestResult?.Message || 'Failed to update conversation');
             }
         }
+        catch (err) {
+            this.mergeDataOntoRecord(conversation, previousValues);
+            this._conversations$.next([...this._conversations$.value]);
+            throw err;
+        }
         finally {
             this._selfMutating = false;
         }
@@ -1531,14 +1603,16 @@ export class ConversationEngine extends BaseEngine {
             if (!row.ID)
                 continue;
             const parsed = ParseConversationDetailComplete(row);
-            // Agent runs
-            if (parsed.agentRuns.length > 0) {
-                const agentRunData = parsed.agentRuns[0];
+            // Agent runs (prefer primary root orchestrating run over continuation synthesis or child runs)
+            const agentRunData = selectPreferredDetailAgentRun(parsed.agentRuns);
+            if (agentRunData) {
                 const agentRun = await md.GetEntityObject('MJ: AI Agent Runs', contextUser);
                 agentRun.LoadFromData({
                     ID: agentRunData.ID,
                     AgentID: agentRunData.AgentID,
                     Agent: agentRunData.Agent,
+                    ParentRunID: agentRunData.ParentRunID ?? null,
+                    ContinuationDepth: agentRunData.ContinuationDepth ?? 0,
                     Status: agentRunData.Status,
                     __mj_CreatedAt: agentRunData.__mj_CreatedAt,
                     __mj_UpdatedAt: agentRunData.__mj_UpdatedAt,
@@ -1600,6 +1674,7 @@ export class ConversationEngine extends BaseEngine {
             {
                 EntityName: 'MJ: Conversation Detail Artifacts',
                 ExtraFilter: `${byDetail} AND Direction='Output'`,
+                OrderBy: '__mj_CreatedAt ASC',
                 ResultType: 'simple'
             }
         ], contextUser);
@@ -1670,6 +1745,14 @@ export class ConversationEngine extends BaseEngine {
             list.push(mergeArtifactJSON(junction, version, artifact));
             byDetailId.set(junction.ConversationDetailID, list);
         }
+        for (const [detailId, list] of byDetailId) {
+            list.sort((a, b) => {
+                const aTime = ToEpochMs(a.VersionCreatedAt) ?? ToEpochMs(a.__mj_CreatedAt) ?? 0;
+                const bTime = ToEpochMs(b.VersionCreatedAt) ?? ToEpochMs(b.__mj_CreatedAt) ?? 0;
+                return aTime - bTime;
+            });
+            byDetailId.set(detailId, list);
+        }
         return byDetailId;
     }
     /** Reads the artifact rows behind a window's artifact versions. */
@@ -1756,12 +1839,14 @@ export class ConversationEngine extends BaseEngine {
             // check for `LoadFromData` before calling it, and hydrate a real entity when
             // we only have plain data. Mirrors the pattern in
             // `conversation-chat-area.component.ts#onMessageComplete` (line ~909).
-            if (parsed.agentRuns.length > 0) {
-                const agentRunData = parsed.agentRuns[0];
+            const agentRunData = selectPreferredDetailAgentRun(parsed.agentRuns);
+            if (agentRunData) {
                 const mergeFields = {
                     ID: agentRunData.ID,
                     AgentID: agentRunData.AgentID,
                     Agent: agentRunData.Agent,
+                    ParentRunID: agentRunData.ParentRunID ?? null,
+                    ContinuationDepth: agentRunData.ContinuationDepth ?? 0,
                     Status: agentRunData.Status,
                     __mj_CreatedAt: agentRunData.__mj_CreatedAt,
                     __mj_UpdatedAt: agentRunData.__mj_UpdatedAt,
@@ -1771,15 +1856,17 @@ export class ConversationEngine extends BaseEngine {
                     ConversationDetailID: agentRunData.ConversationDetailID
                 };
                 const existingRun = existing.AgentRunsByDetailId.get(row.ID);
-                const existingRunIsEntity = !!existingRun && typeof existingRun.LoadFromData === 'function';
-                if (existingRunIsEntity) {
-                    existingRun.LoadFromData(mergeFields);
-                }
-                else {
-                    // Either no existing run, or existing value is plain JSON — hydrate fresh.
-                    const newRun = await md.GetEntityObject('MJ: AI Agent Runs', contextUser);
-                    newRun.LoadFromData(existingRun ? { ...existingRun, ...mergeFields } : agentRunData);
-                    existing.AgentRunsByDetailId.set(row.ID, newRun);
+                if (ShouldReplaceDetailAgentRun(existingRun, agentRunData)) {
+                    const existingRunIsEntity = !!existingRun && typeof existingRun.LoadFromData === 'function';
+                    if (existingRunIsEntity) {
+                        existingRun.LoadFromData(mergeFields);
+                    }
+                    else {
+                        // Either no existing run, or existing value is plain JSON — hydrate fresh.
+                        const newRun = await md.GetEntityObject('MJ: AI Agent Runs', contextUser);
+                        newRun.LoadFromData(existingRun ? { ...existingRun, ...mergeFields } : agentRunData);
+                        existing.AgentRunsByDetailId.set(row.ID, newRun);
+                    }
                 }
             }
             // Replace artifacts per-detail (plain data, cheap to replace)
@@ -2523,7 +2610,9 @@ export class ConversationEngine extends BaseEngine {
         return this._detailCache.get(key)?.AgentRunsByDetailId ?? new Map();
     }
     /**
-     * Adds or updates an agent run in the cache for a specific detail.
+     * Adds or updates an agent run in the cache for a specific detail, honoring
+     * {@link ShouldReplaceDetailAgentRun} so a continuation/sub-agent run never overwrites
+     * the primary root orchestrating run for that detail.
      *
      * @param conversationId - The conversation ID
      * @param detailId - The detail ID the agent run is associated with
@@ -2532,8 +2621,22 @@ export class ConversationEngine extends BaseEngine {
     SetAgentRunForDetail(conversationId, detailId, agentRun) {
         const key = NormalizeUUID(conversationId);
         const cached = this._detailCache.get(key);
-        if (cached) {
-            cached.AgentRunsByDetailId.set(detailId, agentRun);
+        if (!cached) {
+            return;
+        }
+        let targetDetailKey = detailId;
+        let existing = cached.AgentRunsByDetailId.get(detailId);
+        if (!existing) {
+            for (const [cachedDetailId, cachedRun] of cached.AgentRunsByDetailId) {
+                if (UUIDsEqual(cachedDetailId, detailId)) {
+                    targetDetailKey = cachedDetailId;
+                    existing = cachedRun;
+                    break;
+                }
+            }
+        }
+        if (ShouldReplaceDetailAgentRun(existing, agentRun)) {
+            cached.AgentRunsByDetailId.set(targetDetailKey, agentRun);
         }
     }
     // ========================================================================