@mastra/server 1.18.0 → 1.19.0-alpha.2

package/dist/{chunk-HUAXEKGI.cjs → chunk-DAEHQAZC.cjs}

@@ -1732,10 +1732,10 @@ function stripReflectionGroupMetadata(body) {
 function generateAnchorId() {
   return crypto$1.randomBytes(8).toString("hex");
 }
-function wrapInObservationGroup(observations, range, id = generateAnchorId(), sourceGroupIds) {
+function wrapInObservationGroup(observations, range, id = generateAnchorId(), _sourceGroupIds, kind) {
   const content = observations.trim();
-  const sourceGroupIdsAttr = sourceGroupIds?.length ? ` source-group-ids="${sourceGroupIds.join(",")}"` : "";
-  return `<observation-group id="${id}" range="${range}"${sourceGroupIdsAttr}>
+  const kindAttr = kind ? ` kind="${kind}"` : "";
+  return `<observation-group id="${id}" range="${range}"${kindAttr}>
 ${content}
 </observation-group>`;
 }
@@ -1755,8 +1755,8 @@ function parseObservationGroups(observations) {
     groups.push({
       id,
       range,
-      content: match[2].trim(),
-      sourceGroupIds: attributes["source-group-ids"]?.split(",").map((part) => part.trim()).filter(Boolean)
+      kind: attributes.kind,
+      content: match[2].trim()
     });
   }
   return groups;
@@ -1767,12 +1767,22 @@ function stripObservationGroups(observations) {
   }
   return observations.replace(OBSERVATION_GROUP_PATTERN, (_match, _attributes, content) => content.trim()).replace(/\n{3,}/g, "\n\n").trim();
 }
+function getRangeSegments(range) {
+  return range.split(",").map((segment) => segment.trim()).filter(Boolean);
+}
 function combineObservationGroupRanges(groups) {
-  return Array.from(
-    new Set(
-      groups.flatMap((group) => group.range.split(",")).map((range) => range.trim()).filter(Boolean)
-    )
-  ).join(",");
+  const segments = groups.flatMap((group) => getRangeSegments(group.range));
+  if (segments.length === 0) {
+    return "";
+  }
+  const firstSegment = segments[0];
+  const lastSegment = segments[segments.length - 1];
+  const firstStart = firstSegment?.split(":")[0]?.trim();
+  const lastEnd = lastSegment?.split(":").at(-1)?.trim();
+  if (firstStart && lastEnd) {
+    return `${firstStart}:${lastEnd}`;
+  }
+  return Array.from(new Set(segments)).join(",");
 }
 function renderObservationGroupsForReflection(observations) {
   const groups = parseObservationGroups(observations);
@@ -1809,15 +1819,12 @@ function deriveObservationGroupProvenance(content, groups) {
     });
     const fallbackGroup = groups[Math.min(index, groups.length - 1)];
     const resolvedGroups = matchingGroups.length > 0 ? matchingGroups : fallbackGroup ? [fallbackGroup] : [];
-    const sourceGroupIds = Array.from(
-      new Set(resolvedGroups.flatMap((group) => [group.id, ...group.sourceGroupIds ?? []]))
-    );
     const canonicalGroupId = getCanonicalGroupId(section.heading, index);
     return {
       id: canonicalGroupId,
       range: combineObservationGroupRanges(resolvedGroups),
-      content: section.body,
-      sourceGroupIds
+      kind: "reflection",
+      content: section.body
     };
   });
 }
@@ -1832,13 +1839,14 @@ function reconcileObservationGroupsFromReflection(content, sourceObservations) {
   }
   const derivedGroups = deriveObservationGroupProvenance(normalizedContent, sourceGroups);
   if (derivedGroups.length > 0) {
-    return derivedGroups.map((group) => wrapInObservationGroup(group.content, group.range, group.id, group.sourceGroupIds)).join("\n\n");
+    return derivedGroups.map((group) => wrapInObservationGroup(group.content, group.range, group.id, void 0, group.kind)).join("\n\n");
   }
   return wrapInObservationGroup(
     normalizedContent,
     combineObservationGroupRanges(sourceGroups),
     generateAnchorId(),
-    Array.from(new Set(sourceGroups.flatMap((group) => [group.id, ...group.sourceGroupIds ?? []])))
+    void 0,
+    "reflection"
   );
 }
 function getMaxThreshold(threshold) {
@@ -1946,7 +1954,11 @@ var ObservationStrategy = class _ObservationStrategy {
   retrieval;
   /** Select the right strategy based on scope and mode. Wired up by index.ts. */
   static create;
-  /** Run the full observation lifecycle. */
+  /**
+   * Run the full observation lifecycle.
+   * @returns `true` if a full observation cycle completed; `false` if skipped (stale lock) or async-buffer failure was swallowed.
+   * @throws On sync/resource-scoped observer failure after failed markers (same as pre–Option-A contract).
+   */
   async run() {
     const { record, threadId, abortSignal, writer, reflectionHooks, requestContext } = this.opts;
     const cycleId = this.generateCycleId();
@@ -1954,7 +1966,7 @@ var ObservationStrategy = class _ObservationStrategy {
       if (this.needsLock) {
         const fresh = await this.storage.getObservationalMemory(record.threadId, record.resourceId);
         if (fresh?.lastObservedAt && record.lastObservedAt && fresh.lastObservedAt > record.lastObservedAt) {
-          return;
+          return false;
         }
       }
       const { messages, existingObservations } = await this.prepare();
@@ -1975,23 +1987,29 @@ var ObservationStrategy = class _ObservationStrategy {
           observabilityContext: this.opts.observabilityContext
         });
       }
+      return true;
     } catch (error) {
       await this.emitFailedMarkers(cycleId, error);
-      const failedMarkerForStorage = {
-        type: "data-om-observation-failed",
-        data: {
-          cycleId,
-          operationType: "observation",
-          startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          error: error instanceof Error ? error.message : String(error),
-          recordId: record.id,
-          threadId
-        }
-      };
-      await this.persistMarkerToStorage(failedMarkerForStorage, threadId, this.opts.resourceId).catch(() => {
-      });
-      if (abortSignal?.aborted) throw error;
+      if (!this.rethrowOnFailure) {
+        const failedMarkerForStorage = {
+          type: "data-om-observation-failed",
+          data: {
+            cycleId,
+            operationType: "observation",
+            startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            error: error instanceof Error ? error.message : String(error),
+            recordId: record.id,
+            threadId
+          }
+        };
+        await this.persistMarkerToStorage(failedMarkerForStorage, threadId, this.opts.resourceId).catch(() => {
+        });
+        if (abortSignal?.aborted) throw error;
+        omError("[OM] Observation failed", error);
+        return false;
+      }
       omError("[OM] Observation failed", error);
+      throw error;
     }
   }
   // ── Shared helpers ──────────────────────────────────────────
@@ -2212,6 +2230,9 @@ var SyncObservationStrategy = class extends ObservationStrategy {
   get needsReflection() {
     return true;
   }
+  get rethrowOnFailure() {
+    return true;
+  }
   async prepare() {
     const { record, threadId, messages } = this.opts;
     this.deps.emitDebugEvent({
@@ -2403,6 +2424,9 @@ var AsyncBufferObservationStrategy = class extends ObservationStrategy {
   get needsReflection() {
     return false;
   }
+  get rethrowOnFailure() {
+    return false;
+  }
   generateCycleId() {
     return this.cycleId;
   }
@@ -2539,6 +2563,9 @@ var ResourceScopedObservationStrategy = class extends ObservationStrategy {
   get needsReflection() {
     return true;
   }
+  get rethrowOnFailure() {
+    return true;
+  }
   async prepare() {
     const { record, threadId: currentThreadId, messages: currentThreadMessages } = this.opts;
     const { threads: allThreads } = await this.storage.listThreads({ filter: { resourceId: this.resourceId } });
@@ -4818,11 +4845,10 @@ Aim for a 2/10 detail level. Fewer, more generic observations are better than ma
 };
 function buildReflectorPrompt(observations, manualPrompt, compressionLevel, skipContinuationHints) {
   const level = typeof compressionLevel === "number" ? compressionLevel : compressionLevel ? 1 : 0;
-  const reflectionView = renderObservationGroupsForReflection(observations) ?? observations;
-  const anchoredObservations = injectAnchorIds(reflectionView);
+  const reflectionView = stripObservationGroups(observations);
   let prompt = `## OBSERVATIONS TO REFLECT ON
 
-${anchoredObservations}
+${reflectionView}
 
 ---
 
@@ -8792,7 +8818,7 @@ ${grouped}` : grouped;
       }
       hooks?.onObservationStart?.();
       try {
-        await ObservationStrategy.create(this, {
+        observed = await ObservationStrategy.create(this, {
           record: freshRecord,
           threadId,
           resourceId,
@@ -8802,7 +8828,6 @@ ${grouped}` : grouped;
           writer: opts.writer,
           observabilityContext: opts.observabilityContext
         }).run();
-        observed = true;
       } finally {
         hooks?.onObservationEnd?.();
       }
@@ -9434,5 +9459,5 @@ exports.stripEphemeralAnchorIds = stripEphemeralAnchorIds;
 exports.stripObservationGroups = stripObservationGroups;
 exports.truncateStringByTokens = truncateStringByTokens;
 exports.wrapInObservationGroup = wrapInObservationGroup;
-//# sourceMappingURL=chunk-HUAXEKGI.cjs.map
-//# sourceMappingURL=chunk-HUAXEKGI.cjs.map
+//# sourceMappingURL=chunk-DAEHQAZC.cjs.map
+//# sourceMappingURL=chunk-DAEHQAZC.cjs.map