@mastra/server 1.23.0-alpha.3 → 1.23.0-alpha.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @mastra/server
 
+## 1.23.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies [[`fff91cf`](https://github.com/mastra-ai/mastra/commit/fff91cf914de0e731578aacebffdeebef82f0440)]:
+  - @mastra/core@1.23.0-alpha.4
+
 ## 1.23.0-alpha.3
 
 ### Patch Changes

package/dist/{chunk-U6BPUJR3.js → chunk-FLGIOJA5.js}

@@ -1954,7 +1954,7 @@ var ObservationStrategy = class _ObservationStrategy {
   static create;
   /**
    * Run the full observation lifecycle.
-   * @returns `true` if a full observation cycle completed; `false` if skipped (stale lock) or async-buffer failure was swallowed.
+   * @returns Result with `observed` flag and optional `usage` from the observer LLM call.
    * @throws On sync/resource-scoped observer failure after failed markers (same as pre–Option-A contract).
    */
   async run() {
@@ -1964,7 +1964,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 false;
+          return { observed: false };
         }
       }
       const { messages, existingObservations } = await this.prepare();
@@ -1985,7 +1985,7 @@ var ObservationStrategy = class _ObservationStrategy {
           observabilityContext: this.opts.observabilityContext
         });
       }
-      return true;
+      return { observed: true, usage: output.usage };
     } catch (error) {
       await this.emitFailedMarkers(cycleId, error);
       if (!this.rethrowOnFailure) {
@@ -2004,7 +2004,7 @@ var ObservationStrategy = class _ObservationStrategy {
         });
         if (abortSignal?.aborted) throw error;
         omError("[OM] Observation failed", error);
-        return false;
+        return { observed: false };
       }
       omError("[OM] Observation failed", error);
       throw error;
@@ -5188,7 +5188,7 @@ var ReflectorRunner = class {
   /**
    * Start an async buffered reflection in the background.
    */
-  startAsyncBufferedReflection(record, observationTokens, lockKey, writer, requestContext, observabilityContext) {
+  startAsyncBufferedReflection(record, observationTokens, lockKey, writer, requestContext, observabilityContext, reflectionHooks) {
     const bufferKey = this.buffering.getReflectionBufferKey(lockKey);
     if (this.buffering.isAsyncBufferingInProgress(bufferKey)) {
       return;
@@ -5198,7 +5198,10 @@ var ReflectorRunner = class {
     this.storage.setBufferingReflectionFlag(record.id, true).catch((err) => {
       omError("[OM] Failed to set buffering reflection flag", err);
     });
-    const asyncOp = this.doAsyncBufferedReflection(record, bufferKey, writer, requestContext, observabilityContext).catch(async (error) => {
+    reflectionHooks?.onReflectionStart?.();
+    const asyncOp = this.doAsyncBufferedReflection(record, bufferKey, writer, requestContext, observabilityContext).then((usage) => {
+      reflectionHooks?.onReflectionEnd?.({ usage });
+    }).catch(async (error) => {
       if (writer) {
         const failedMarker = createBufferingFailedMarker({
           cycleId: `reflect-buf-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`,
@@ -5214,6 +5217,10 @@ var ReflectorRunner = class {
         await this.persistMarkerToStorage(failedMarker, record.threadId ?? "", record.resourceId ?? void 0);
       }
       omError("[OM] Async buffered reflection failed", error);
+      reflectionHooks?.onReflectionEnd?.({
+        usage: void 0,
+        error: error instanceof Error ? error : new Error(String(error))
+      });
       BufferingCoordinator.lastBufferedBoundary.delete(bufferKey);
     }).finally(() => {
       BufferingCoordinator.asyncBufferingOps.delete(bufferKey);
@@ -5307,6 +5314,7 @@ var ReflectorRunner = class {
       });
       await this.persistMarkerToStorage(endMarker, currentRecord.threadId ?? "", currentRecord.resourceId ?? void 0);
     }
+    return reflectResult.usage;
   }
   /**
    * Try to activate buffered reflection when threshold is reached.
@@ -5427,7 +5435,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
           lockKey,
           writer,
           requestContext,
-          observabilityContext
+          observabilityContext,
+          reflectionHooks
         );
       }
     }
@@ -5461,7 +5470,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
           lockKey,
           writer,
           requestContext,
-          observabilityContext
+          observabilityContext,
+          reflectionHooks
         );
         return;
       }
@@ -5500,6 +5510,8 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
       recordId: record.id,
       threadId
     } : void 0;
+    let reflectionUsage;
+    let reflectionError;
     try {
       const compressionStartLevel = await this.getCompressionStartLevel(requestContext);
       const reflectResult = await this.call(
@@ -5513,6 +5525,7 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         requestContext,
         observabilityContext
       );
+      reflectionUsage = reflectResult.usage;
       const reflectionTokenCount = this.tokenCounter.countObservations(reflectResult.observations);
       await this.storage.createReflectionGeneration({
         currentRecord: record,
@@ -5557,13 +5570,14 @@ ${unreflectedContent}` : freshRecord.bufferedReflection;
         await writer.custom(failedMarker).catch(() => {
         });
       }
+      reflectionError = error instanceof Error ? error : new Error(String(error));
       if (abortSignal?.aborted) {
         throw error;
       }
       omError("[OM] Reflection failed", error);
     } finally {
       await this.storage.setReflectingFlag(record.id, false);
-      reflectionHooks?.onReflectionEnd?.();
+      reflectionHooks?.onReflectionEnd?.({ usage: reflectionUsage, error: reflectionError });
       unregisterOp(record.id, "reflecting");
     }
   }
@@ -8906,6 +8920,7 @@ ${grouped}` : grouped;
     const lockKey = this.buffering.getLockKey(threadId, resourceId);
     const reflectionHooks = hooks ? { onReflectionStart: hooks.onReflectionStart, onReflectionEnd: hooks.onReflectionEnd } : void 0;
     let observed = false;
+    let observationUsage;
     let generationBefore = -1;
     await this.withLock(lockKey, async () => {
       const freshRecord = await this.getOrCreateRecord(threadId, resourceId);
@@ -8922,8 +8937,9 @@ ${grouped}` : grouped;
         return;
       }
       hooks?.onObservationStart?.();
+      let observationError;
       try {
-        observed = await ObservationStrategy.create(this, {
+        const result = await ObservationStrategy.create(this, {
           record: freshRecord,
           threadId,
           resourceId,
@@ -8933,8 +8949,13 @@ ${grouped}` : grouped;
           writer: opts.writer,
           observabilityContext: opts.observabilityContext
         }).run();
+        observed = result.observed;
+        observationUsage = result.usage;
+      } catch (error) {
+        observationError = error instanceof Error ? error : new Error(String(error));
+        throw error;
       } finally {
-        hooks?.onObservationEnd?.();
+        hooks?.onObservationEnd?.({ usage: observationUsage, error: observationError });
       }
     });
     const record = await this.getOrCreateRecord(threadId, resourceId);
@@ -8955,7 +8976,7 @@ ${grouped}` : grouped;
   async reflect(threadId, resourceId, prompt, requestContext, observabilityContext) {
     const record = await this.getOrCreateRecord(threadId, resourceId);
     if (!record.activeObservations) {
-      return { reflected: false, record };
+      return { reflected: false, record, usage: void 0 };
     }
     await this.storage.setReflectingFlag(record.id, true);
     registerOp(record.id, "reflecting");
@@ -8980,11 +9001,11 @@ ${grouped}` : grouped;
         tokenCount: reflectionTokenCount
       });
       const updatedRecord = await this.getOrCreateRecord(threadId, resourceId);
-      return { reflected: true, record: updatedRecord };
+      return { reflected: true, record: updatedRecord, usage: reflectResult.usage };
     } catch (error) {
       omError("[OM] reflect() failed", error);
       const latestRecord = await this.getOrCreateRecord(threadId, resourceId);
-      return { reflected: false, record: latestRecord };
+      return { reflected: false, record: latestRecord, usage: void 0 };
     } finally {
       await this.storage.setReflectingFlag(record.id, false);
       unregisterOp(record.id, "reflecting");
@@ -9552,5 +9573,5 @@ function getObservationsAsOf(activeObservations, asOf) {
 }
 
 export { ModelByInputTokens, OBSERVER_SYSTEM_PROMPT, ObservationalMemory, ObservationalMemoryProcessor, TokenCounter, buildObserverPrompt, buildObserverSystemPrompt, combineObservationGroupRanges, deriveObservationGroupProvenance, e, estimateTokenCount, extractCurrentTask, formatMessagesForObserver, formatToolResultForObserver, getObservationsAsOf, hasCurrentTaskSection, injectAnchorIds, optimizeObservationsForContext, parseAnchorId, parseObservationGroups, parseObserverOutput, reconcileObservationGroupsFromReflection, renderObservationGroupsForReflection, resolveToolResultValue, stripEphemeralAnchorIds, stripObservationGroups, truncateStringByTokens, wrapInObservationGroup };
-//# sourceMappingURL=chunk-U6BPUJR3.js.map
-//# sourceMappingURL=chunk-U6BPUJR3.js.map
+//# sourceMappingURL=chunk-FLGIOJA5.js.map
+//# sourceMappingURL=chunk-FLGIOJA5.js.map