@raindrop-ai/openai-managed-agents 0.0.1 → 0.0.2

package/README.md

@@ -68,15 +68,19 @@ For a runner that reconnects streams, use the public typed handler with an
 unwrapped native client. Keep one Raindrop client for the runner's lifetime:
 
 ```ts
+import type { Turn } from "openai/resources/beta/agents/sessions/turns";
+
 raindrop.handler.onSession(session);
 raindrop.handler.onInput(session.id, userInput); // after successful submission
-// Recover missed item events before completing recovered turns.
+// Snapshot turn statuses before recovering their items.
+const recoveredTurns: Turn[] = [];
+for await (const turn of client.beta.agents.sessions.turns.list(session.id, { order: "asc" })) {
+  recoveredTurns.push(turn);
+}
 for await (const item of client.beta.agents.sessions.items.list(session.id, { order: "asc" })) {
   raindrop.handler.onItem(session.id, item);
 }
-for await (const turn of client.beta.agents.sessions.turns.list(session.id, { order: "asc" })) {
-  raindrop.handler.onTurn(turn);
-}
+for (const turn of recoveredTurns) raindrop.handler.onTurn(turn);
 for await (const event of events) raindrop.handler.onEvent(event);
 await raindrop.flush();
 // After all streams/recovery work are stopped:
@@ -84,8 +88,10 @@ raindrop.handler.forgetSession(session.id);
 await raindrop.shutdown();
 ```
 
-Open the stream before recovery so it can buffer live updates. Recover stored
-items, then stored turns, before consuming buffered events.
+Open the stream before recovery so it can buffer live updates. Read and buffer
+turn statuses first, recover items next, then pass the buffered turns to the
+handler. A turn completed after the snapshot closes from its buffered live
+terminal event. Process callbacks serially during recovery and consumption.
 
 `onInputEvents(sessionId, events)` records accepted message/tool-result submissions.
 Repeated terminal turns and tool receipts are deduplicated within this client.
@@ -93,11 +99,11 @@ Turn deduplication retains the latest 10,000 completed turns. Across process
 restarts, provide a stable `eventId: (turnId) => ...` and replay items before turns.
 No session or item listing is intercepted automatically.
 
-The wrapper closes unfinished captures in the iterator's `finally`, including
-early exit and transport failure. This marks capture interruption; it does not
+The wrapper closes unfinished captures when the last iterator for a session
+exits, including early exit and transport failure. This marks capture interruption; it does not
 cancel the backend turn. Session model and context remain available for later
 streams; the previous input is cleared. Metadata retains the latest 10,000 idle
-sessions plus sessions with active turns. Call `forgetSession` when
+sessions plus sessions with active turns or streams. Call `forgetSession` when
 the session is no longer needed. Use the callback path when an unfinished turn
 must survive a reconnection.
 
@@ -133,5 +139,5 @@ configuration. Subagent model and inherited coordinator input stay absent unless
 their own input is recorded.
 
 See [RELEASING.md](RELEASING.md) for first-publication and verification steps.
-See the [integration docs](https://docs.raindrop.ai/integrations/openai-managed-agents)
+See the [integration docs](https://www.raindrop.ai/docs/integrations/openai-managed-agents)
 for configuration details.

package/dist/index.js

@@ -2369,13 +2369,13 @@ var RaindropManagedAgentsHandler = class {
   sessionCapture(sessionId) {
     const existing = this.sessions.get(sessionId);
     if (existing) return existing;
-    const session = { context: this.opts, turns: /* @__PURE__ */ new Map() };
+    const session = { context: this.opts, turns: /* @__PURE__ */ new Map(), activeStreams: 0 };
     this.sessions.set(sessionId, session);
     return session;
   }
   cacheSession(sessionId, session) {
     this.idleSessions.delete(sessionId);
-    if (session.turns.size > 0) return;
+    if (session.turns.size > 0 || session.activeStreams > 0) return;
     this.idleSessions.add(sessionId);
     if (this.idleSessions.size <= 1e4) return;
     const oldest = this.idleSessions.values().next().value;
@@ -2388,7 +2388,16 @@ var RaindropManagedAgentsHandler = class {
     try {
       const capture = this.sessionCapture(session.id);
       capture.model = session.agent.model;
-      capture.context = { ...this.opts, ...capture.context, ...context };
+      capture.context = {
+        ...this.opts,
+        ...capture.context,
+        ...context,
+        properties: {
+          ...this.opts.properties,
+          ...capture.context.properties,
+          ...context.properties
+        }
+      };
       this.cacheSession(session.id, capture);
     } catch (e) {
     }
@@ -2412,7 +2421,12 @@ var RaindropManagedAgentsHandler = class {
     const existing = session.turns.get(turnId);
     if (existing) return existing;
     const context = session.context;
-    const eventId = (_c = (_b = (_a = this.opts).eventId) == null ? void 0 : _b.call(_a, turnId)) != null ? _c : randomUUID();
+    let eventId;
+    try {
+      eventId = (_c = (_b = (_a = this.opts).eventId) == null ? void 0 : _b.call(_a, turnId)) == null ? void 0 : _c.trim();
+    } catch (e) {
+    }
+    eventId || (eventId = randomUUID());
     const patch = {
       userId: context.userId,
       convoId: (_d = context.convoId) != null ? _d : sessionId,
@@ -2682,6 +2696,25 @@ var RaindropManagedAgentsHandler = class {
     }
     this.cacheSession(sessionId, session);
   }
+  /** @internal */
+  onStreamStart(sessionId) {
+    try {
+      const session = this.sessionCapture(sessionId);
+      session.activeStreams++;
+      this.cacheSession(sessionId, session);
+    } catch (e) {
+    }
+  }
+  /** @internal */
+  onStreamEnd(sessionId) {
+    try {
+      const session = this.sessions.get(sessionId);
+      if (!session) return;
+      session.activeStreams = Math.max(0, session.activeStreams - 1);
+      if (session.activeStreams === 0) this.closeSessionTurns(sessionId);
+    } catch (e) {
+    }
+  }
   closeSessionTurns(sessionId, error) {
     try {
       const session = this.sessions.get(sessionId);
@@ -2714,15 +2747,15 @@ var RaindropManagedAgentsHandler = class {
 // package.json
 var package_default = {
   name: "@raindrop-ai/openai-managed-agents",
-  version: "0.0.1",
+  version: "0.0.2",
   description: "Raindrop tracing for the OpenAI Agents API",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
   license: "MIT",
-  homepage: "https://docs.raindrop.ai/integrations/openai-managed-agents",
+  homepage: "https://www.raindrop.ai/docs/integrations/openai-managed-agents",
   bugs: {
-    url: "https://docs.raindrop.ai/support"
+    url: "https://www.raindrop.ai/docs/support"
   },
   exports: {
     ".": {
@@ -2793,14 +2826,18 @@ var libraryVersion = package_default.version;
 // src/wrap.ts
 var import_streaming = require("openai/core/streaming");
 async function* observe(events, handler, sessionId) {
+  if (sessionId) handler.onStreamStart(sessionId);
   try {
     for await (const event of events) {
-      if (event.type === "agent.session.created") sessionId = event.session.id;
+      if (!sessionId && event.type === "agent.session.created") {
+        sessionId = event.session.id;
+        handler.onStreamStart(sessionId);
+      }
       handler.onEvent(event);
       yield event;
     }
   } finally {
-    if (sessionId) handler.closeSessionTurns(sessionId);
+    if (sessionId) handler.onStreamEnd(sessionId);
   }
 }
 function wrapManagedAgents(client, handler, context) {
@@ -2828,19 +2865,12 @@ function wrapManagedAgents(client, handler, context) {
           if (result instanceof import_streaming.Stream) {
             const source = result;
             async function* initialEvents() {
-              let sessionId;
-              try {
-                for await (const event of source) {
-                  if (event.type === "agent.session.created") {
-                    sessionId = event.session.id;
-                    handler.onSession(event.session, context);
-                    handler.onInput(event.session.id, params.input);
-                  }
-                  handler.onEvent(event);
-                  yield event;
+              for await (const event of observe(source, handler)) {
+                if (event.type === "agent.session.created") {
+                  handler.onSession(event.session, context);
+                  handler.onInput(event.session.id, params.input);
                 }
-              } finally {
-                if (sessionId) handler.closeSessionTurns(sessionId);
+                yield event;
               }
             }
             return new import_streaming.Stream(initialEvents, result.controller);
@@ -2855,20 +2885,7 @@ function wrapManagedAgents(client, handler, context) {
           return session;
         });
       if (prop === "stream")
-        return (sessionId, params, options) => {
-          const stream = target.stream(sessionId, params, options);
-          return new Proxy(stream, {
-            get(obj, key) {
-              if (key === Symbol.asyncIterator)
-                return () => {
-                  handler.onInput(sessionId, params.input);
-                  return observe(stream, handler, sessionId);
-                };
-              const value2 = Reflect.get(obj, key, obj);
-              return typeof value2 === "function" ? value2.bind(obj) : value2;
-            }
-          });
-        };
+        return (sessionId, params, options) => target.stream.call(wrappedSessions, sessionId, params, options);
       const value = Reflect.get(target, prop, target);
       return typeof value === "function" ? value.bind(target) : value;
     }

package/dist/index.mjs

@@ -2342,13 +2342,13 @@ var RaindropManagedAgentsHandler = class {
   sessionCapture(sessionId) {
     const existing = this.sessions.get(sessionId);
     if (existing) return existing;
-    const session = { context: this.opts, turns: /* @__PURE__ */ new Map() };
+    const session = { context: this.opts, turns: /* @__PURE__ */ new Map(), activeStreams: 0 };
     this.sessions.set(sessionId, session);
     return session;
   }
   cacheSession(sessionId, session) {
     this.idleSessions.delete(sessionId);
-    if (session.turns.size > 0) return;
+    if (session.turns.size > 0 || session.activeStreams > 0) return;
     this.idleSessions.add(sessionId);
     if (this.idleSessions.size <= 1e4) return;
     const oldest = this.idleSessions.values().next().value;
@@ -2361,7 +2361,16 @@ var RaindropManagedAgentsHandler = class {
     try {
       const capture = this.sessionCapture(session.id);
       capture.model = session.agent.model;
-      capture.context = { ...this.opts, ...capture.context, ...context };
+      capture.context = {
+        ...this.opts,
+        ...capture.context,
+        ...context,
+        properties: {
+          ...this.opts.properties,
+          ...capture.context.properties,
+          ...context.properties
+        }
+      };
       this.cacheSession(session.id, capture);
     } catch (e) {
     }
@@ -2385,7 +2394,12 @@ var RaindropManagedAgentsHandler = class {
     const existing = session.turns.get(turnId);
     if (existing) return existing;
     const context = session.context;
-    const eventId = (_c = (_b = (_a = this.opts).eventId) == null ? void 0 : _b.call(_a, turnId)) != null ? _c : randomUUID();
+    let eventId;
+    try {
+      eventId = (_c = (_b = (_a = this.opts).eventId) == null ? void 0 : _b.call(_a, turnId)) == null ? void 0 : _c.trim();
+    } catch (e) {
+    }
+    eventId || (eventId = randomUUID());
     const patch = {
       userId: context.userId,
       convoId: (_d = context.convoId) != null ? _d : sessionId,
@@ -2655,6 +2669,25 @@ var RaindropManagedAgentsHandler = class {
     }
     this.cacheSession(sessionId, session);
   }
+  /** @internal */
+  onStreamStart(sessionId) {
+    try {
+      const session = this.sessionCapture(sessionId);
+      session.activeStreams++;
+      this.cacheSession(sessionId, session);
+    } catch (e) {
+    }
+  }
+  /** @internal */
+  onStreamEnd(sessionId) {
+    try {
+      const session = this.sessions.get(sessionId);
+      if (!session) return;
+      session.activeStreams = Math.max(0, session.activeStreams - 1);
+      if (session.activeStreams === 0) this.closeSessionTurns(sessionId);
+    } catch (e) {
+    }
+  }
   closeSessionTurns(sessionId, error) {
     try {
       const session = this.sessions.get(sessionId);
@@ -2687,15 +2720,15 @@ var RaindropManagedAgentsHandler = class {
 // package.json
 var package_default = {
   name: "@raindrop-ai/openai-managed-agents",
-  version: "0.0.1",
+  version: "0.0.2",
   description: "Raindrop tracing for the OpenAI Agents API",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
   license: "MIT",
-  homepage: "https://docs.raindrop.ai/integrations/openai-managed-agents",
+  homepage: "https://www.raindrop.ai/docs/integrations/openai-managed-agents",
   bugs: {
-    url: "https://docs.raindrop.ai/support"
+    url: "https://www.raindrop.ai/docs/support"
   },
   exports: {
     ".": {
@@ -2766,14 +2799,18 @@ var libraryVersion = package_default.version;
 // src/wrap.ts
 import { Stream } from "openai/core/streaming";
 async function* observe(events, handler, sessionId) {
+  if (sessionId) handler.onStreamStart(sessionId);
   try {
     for await (const event of events) {
-      if (event.type === "agent.session.created") sessionId = event.session.id;
+      if (!sessionId && event.type === "agent.session.created") {
+        sessionId = event.session.id;
+        handler.onStreamStart(sessionId);
+      }
       handler.onEvent(event);
       yield event;
     }
   } finally {
-    if (sessionId) handler.closeSessionTurns(sessionId);
+    if (sessionId) handler.onStreamEnd(sessionId);
   }
 }
 function wrapManagedAgents(client, handler, context) {
@@ -2801,19 +2838,12 @@ function wrapManagedAgents(client, handler, context) {
           if (result instanceof Stream) {
             const source = result;
             async function* initialEvents() {
-              let sessionId;
-              try {
-                for await (const event of source) {
-                  if (event.type === "agent.session.created") {
-                    sessionId = event.session.id;
-                    handler.onSession(event.session, context);
-                    handler.onInput(event.session.id, params.input);
-                  }
-                  handler.onEvent(event);
-                  yield event;
+              for await (const event of observe(source, handler)) {
+                if (event.type === "agent.session.created") {
+                  handler.onSession(event.session, context);
+                  handler.onInput(event.session.id, params.input);
                 }
-              } finally {
-                if (sessionId) handler.closeSessionTurns(sessionId);
+                yield event;
               }
             }
             return new Stream(initialEvents, result.controller);
@@ -2828,20 +2858,7 @@ function wrapManagedAgents(client, handler, context) {
           return session;
         });
       if (prop === "stream")
-        return (sessionId, params, options) => {
-          const stream = target.stream(sessionId, params, options);
-          return new Proxy(stream, {
-            get(obj, key) {
-              if (key === Symbol.asyncIterator)
-                return () => {
-                  handler.onInput(sessionId, params.input);
-                  return observe(stream, handler, sessionId);
-                };
-              const value2 = Reflect.get(obj, key, obj);
-              return typeof value2 === "function" ? value2.bind(obj) : value2;
-            }
-          });
-        };
+        return (sessionId, params, options) => target.stream.call(wrappedSessions, sessionId, params, options);
       const value = Reflect.get(target, prop, target);
       return typeof value === "function" ? value.bind(target) : value;
     }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@raindrop-ai/openai-managed-agents",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Raindrop tracing for the OpenAI Agents API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "license": "MIT",
-  "homepage": "https://docs.raindrop.ai/integrations/openai-managed-agents",
+  "homepage": "https://www.raindrop.ai/docs/integrations/openai-managed-agents",
   "bugs": {
-    "url": "https://docs.raindrop.ai/support"
+    "url": "https://www.raindrop.ai/docs/support"
   },
   "exports": {
     ".": {