orchajs 0.23.8 → 0.23.10

package/dist/amarsia/analytics.d.ts

@@ -7,6 +7,8 @@ export declare class AmarsiaTelemetryClient {
         endpoint?: string;
     });
     enqueue(fact: AmarsiaRunFact): void;
+    /** @internal Tracks telemetry projection work that must settle before drain completes. */
+    trackProjection(projection: Promise<void>): void;
     drain(options?: {
         timeoutMs?: number;
     }): Promise<void>;

package/dist/amarsia/analytics.js

@@ -10,11 +10,13 @@ const RELEVANT_EVENTS = new Set([
 const MAX_BATCH_RUNS = 100;
 const MAX_KEEPALIVE_BYTES = 48 * 1024;
 const HEARTBEAT_INTERVAL_MS = 30_000;
+const EVALUATION_FLUSH_TIMEOUT_MS = 5_000;
 export class AmarsiaTelemetryClient {
     #key;
     #baseUrl;
     #queue = new Map();
     #activeRuns = new Map();
+    #pendingProjections = new Set();
     #timer;
     #heartbeatTimer;
     #attempt = 0;
@@ -56,6 +58,13 @@ export class AmarsiaTelemetryClient {
         const timer = this.#timer;
         timer.unref?.();
     }
+    /** @internal Tracks telemetry projection work that must settle before drain completes. */
+    trackProjection(projection) {
+        this.#pendingProjections.add(projection);
+        void projection.finally(() => {
+            this.#pendingProjections.delete(projection);
+        });
+    }
     #scheduleTerminal() {
         if (this.#timer)
             clearTimeout(this.#timer);
@@ -81,14 +90,23 @@ export class AmarsiaTelemetryClient {
     async drain(options = {}) {
         const timeoutMs = Math.max(0, options.timeoutMs ?? 2_000);
         const deadline = Date.now() + timeoutMs;
-        if (this.#timer) {
-            clearTimeout(this.#timer);
-            this.#timer = undefined;
-        }
-        while (this.#queue.size > 0 || this.#flushPromise) {
+        while (this.#pendingProjections.size > 0 ||
+            this.#queue.size > 0 ||
+            this.#flushPromise) {
             const remaining = deadline - Date.now();
             if (remaining <= 0)
                 return;
+            if (this.#pendingProjections.size > 0) {
+                await Promise.race([
+                    Promise.allSettled([...this.#pendingProjections]).then(() => undefined),
+                    new Promise((resolve) => setTimeout(resolve, remaining)),
+                ]);
+                continue;
+            }
+            if (this.#timer) {
+                clearTimeout(this.#timer);
+                this.#timer = undefined;
+            }
             await Promise.race([
                 this.#flush(),
                 new Promise((resolve) => setTimeout(resolve, remaining)),
@@ -102,6 +120,11 @@ export class AmarsiaTelemetryClient {
         }
         this.#activeRuns.clear();
         await this.drain(options);
+        if (this.#heartbeatTimer) {
+            clearTimeout(this.#heartbeatTimer);
+            this.#heartbeatTimer = undefined;
+        }
+        this.#activeRuns.clear();
     }
     async #flush() {
         if (this.#flushPromise)
@@ -206,11 +229,23 @@ export function withAmarsiaTelemetry(options) {
             })
                 .catch(() => undefined);
             pending.set(sessionId, processing);
+            client.trackProjection(processing);
             void processing.finally(() => {
                 if (pending.get(sessionId) === processing) {
                     pending.delete(sessionId);
                 }
             });
+            const hasTerminalRunEvent = events.some((event) => event.type === "run.completed" ||
+                event.type === "run.failed" ||
+                event.type === "run.paused");
+            const hasEvaluationResult = events.some((event) => event.type === "evaluation.completed" ||
+                event.type === "evaluation.failed");
+            if (hasTerminalRunEvent || hasEvaluationResult) {
+                await processing;
+            }
+            if (hasEvaluationResult) {
+                await client.drain({ timeoutMs: EVALUATION_FLUSH_TIMEOUT_MS });
+            }
         },
     };
 }

package/dist-cjs/amarsia/analytics.js

@@ -35,11 +35,13 @@ const RELEVANT_EVENTS = /* @__PURE__ */ new Set([
 const MAX_BATCH_RUNS = 100;
 const MAX_KEEPALIVE_BYTES = 48 * 1024;
 const HEARTBEAT_INTERVAL_MS = 3e4;
+const EVALUATION_FLUSH_TIMEOUT_MS = 5e3;
 class AmarsiaTelemetryClient {
   #key;
   #baseUrl;
   #queue = /* @__PURE__ */ new Map();
   #activeRuns = /* @__PURE__ */ new Map();
+  #pendingProjections = /* @__PURE__ */ new Set();
   #timer;
   #heartbeatTimer;
   #attempt = 0;
@@ -79,6 +81,13 @@ class AmarsiaTelemetryClient {
     const timer = this.#timer;
     timer.unref?.();
   }
+  /** @internal Tracks telemetry projection work that must settle before drain completes. */
+  trackProjection(projection) {
+    this.#pendingProjections.add(projection);
+    void projection.finally(() => {
+      this.#pendingProjections.delete(projection);
+    });
+  }
   #scheduleTerminal() {
     if (this.#timer) clearTimeout(this.#timer);
     this.#timer = setTimeout(() => {
@@ -102,13 +111,20 @@ class AmarsiaTelemetryClient {
   async drain(options = {}) {
     const timeoutMs = Math.max(0, options.timeoutMs ?? 2e3);
     const deadline = Date.now() + timeoutMs;
-    if (this.#timer) {
-      clearTimeout(this.#timer);
-      this.#timer = void 0;
-    }
-    while (this.#queue.size > 0 || this.#flushPromise) {
+    while (this.#pendingProjections.size > 0 || this.#queue.size > 0 || this.#flushPromise) {
       const remaining = deadline - Date.now();
       if (remaining <= 0) return;
+      if (this.#pendingProjections.size > 0) {
+        await Promise.race([
+          Promise.allSettled([...this.#pendingProjections]).then(() => void 0),
+          new Promise((resolve) => setTimeout(resolve, remaining))
+        ]);
+        continue;
+      }
+      if (this.#timer) {
+        clearTimeout(this.#timer);
+        this.#timer = void 0;
+      }
       await Promise.race([
         this.#flush(),
         new Promise((resolve) => setTimeout(resolve, remaining))
@@ -122,6 +138,11 @@ class AmarsiaTelemetryClient {
     }
     this.#activeRuns.clear();
     await this.drain(options);
+    if (this.#heartbeatTimer) {
+      clearTimeout(this.#heartbeatTimer);
+      this.#heartbeatTimer = void 0;
+    }
+    this.#activeRuns.clear();
   }
   async #flush() {
     if (this.#flushPromise) return this.#flushPromise;
@@ -223,11 +244,24 @@ function withAmarsiaTelemetry(options) {
         }
       }).catch(() => void 0);
       pending.set(sessionId, processing);
+      client.trackProjection(processing);
       void processing.finally(() => {
         if (pending.get(sessionId) === processing) {
           pending.delete(sessionId);
         }
       });
+      const hasTerminalRunEvent = events.some(
+        (event) => event.type === "run.completed" || event.type === "run.failed" || event.type === "run.paused"
+      );
+      const hasEvaluationResult = events.some(
+        (event) => event.type === "evaluation.completed" || event.type === "evaluation.failed"
+      );
+      if (hasTerminalRunEvent || hasEvaluationResult) {
+        await processing;
+      }
+      if (hasEvaluationResult) {
+        await client.drain({ timeoutMs: EVALUATION_FLUSH_TIMEOUT_MS });
+      }
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchajs",
-  "version": "0.23.8",
+  "version": "0.23.10",
   "description": "A filesystem-convention, stateful agent framework for JavaScript.",
   "license": "MIT",
   "repository": {