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

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.
 
@@ -114,6 +120,27 @@ responsibility.
 `users.identify`, and `signals.track` expose the shared core enrichment API.
 `flush()` ships current buffers; `shutdown()` also closes unfinished captures.
 
+## Tool catalog capture (`ai.prompt.tools`)
+
+**Agent configuration, not exact per-call capture.** Model calls run inside
+OpenAI's managed runtime, so the wrapper never sees individual requests. It
+does see the resolved agent definition on the session (`session.agent.tools`)
+and records it as `ai.prompt.tools` on every coordinator `openai.agent.turn`
+span (one per model turn), together with
+`ai.prompt.tools.source = "agent.config"` so consumers can tell this
+configuration snapshot from exact capture. Function tools keep their JSON
+Schema `parameters`; `mcp`, `web_search`, `tool_search` and
+`programmatic_tool_calling` entries are provider-owned and recorded as
+`{"type":"provider-defined",…}` without an invented schema. Subagent turns run
+their own tool sets, so they only receive an explicit override. Absent
+attribute = catalog unknown; `[]` = the agent has no tools. This package has no
+separate prompt-content switch, so the attribute is recorded whenever tracing
+is enabled.
+
+| Option | Description |
+| --- | --- |
+| `tools` (on `createRaindropOpenAIManagedAgents({ tools })` or `wrap(client, { tools })`) | Overrides the tool catalog recorded as `ai.prompt.tools` on every model span. Use when the integration cannot see the tools the model was given. Replaces the agent definition entirely (`tools: []` records an empty catalog) and carries no `source` attribute. |
+
 ## Limits
 
 The service does not expose individual inference requests. Captures represent
@@ -133,5 +160,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.d.mts

@@ -506,9 +506,42 @@ declare global {
     var RAINDROP_CONTEXT_MANAGER: (new () => ContextManager) | undefined;
     var RAINDROP_ASYNC_LOCAL_STORAGE: (new <T>() => AsyncLocalStorageLike<T>) | undefined;
 }
+type JsonSchema = Record<string, unknown>;
+type FunctionToolDeclaration = {
+    type: "function";
+    name: string;
+    description?: string;
+    inputSchema?: JsonSchema;
+};
+type ProviderDefinedToolDeclaration = {
+    type: "provider-defined";
+    id?: string;
+    name: string;
+    args?: Record<string, unknown>;
+};
+type ToolDeclaration = FunctionToolDeclaration | ProviderDefinedToolDeclaration;
+/**
+ * What callers hand to a `tools` override. The canonical `ToolDeclaration`
+ * shape is accepted as-is; so is any framework shape `normalizeToolDeclarations`
+ * recognizes (OpenAI, Anthropic, Bedrock, LangChain, Pi, Mastra, AI SDK).
+ */
+type ToolDeclarationInput = ToolDeclaration | {
+    name: string;
+    description?: string;
+    inputSchema?: JsonSchema;
+    parameters?: JsonSchema;
+};
+type PromptToolsOverride = ReadonlyArray<ToolDeclarationInput | unknown>;
 
 type SessionContext = {
     [Key in keyof Pick<Patch, "userId" | "convoId" | "eventName" | "properties">]?: Patch[Key] | undefined;
+} & {
+    /**
+     * Overrides the tool catalog recorded as `ai.prompt.tools` on every model
+     * span. Use when the integration cannot see the tools the model was given.
+     * Without it the agent definition on the session (`session.agent.tools`) is used.
+     */
+    tools?: PromptToolsOverride | undefined;
 };
 type OpenAIManagedAgentsOptions = SessionContext & {
     writeKey?: string | undefined;

package/dist/index.d.ts

@@ -506,9 +506,42 @@ declare global {
     var RAINDROP_CONTEXT_MANAGER: (new () => ContextManager) | undefined;
     var RAINDROP_ASYNC_LOCAL_STORAGE: (new <T>() => AsyncLocalStorageLike<T>) | undefined;
 }
+type JsonSchema = Record<string, unknown>;
+type FunctionToolDeclaration = {
+    type: "function";
+    name: string;
+    description?: string;
+    inputSchema?: JsonSchema;
+};
+type ProviderDefinedToolDeclaration = {
+    type: "provider-defined";
+    id?: string;
+    name: string;
+    args?: Record<string, unknown>;
+};
+type ToolDeclaration = FunctionToolDeclaration | ProviderDefinedToolDeclaration;
+/**
+ * What callers hand to a `tools` override. The canonical `ToolDeclaration`
+ * shape is accepted as-is; so is any framework shape `normalizeToolDeclarations`
+ * recognizes (OpenAI, Anthropic, Bedrock, LangChain, Pi, Mastra, AI SDK).
+ */
+type ToolDeclarationInput = ToolDeclaration | {
+    name: string;
+    description?: string;
+    inputSchema?: JsonSchema;
+    parameters?: JsonSchema;
+};
+type PromptToolsOverride = ReadonlyArray<ToolDeclarationInput | unknown>;
 
 type SessionContext = {
     [Key in keyof Pick<Patch, "userId" | "convoId" | "eventName" | "properties">]?: Patch[Key] | undefined;
+} & {
+    /**
+     * Overrides the tool catalog recorded as `ai.prompt.tools` on every model
+     * span. Use when the integration cannot see the tools the model was given.
+     * Without it the agent definition on the session (`session.agent.tools`) is used.
+     */
+    tools?: PromptToolsOverride | undefined;
 };
 type OpenAIManagedAgentsOptions = SessionContext & {
     writeKey?: string | undefined;

package/dist/index.js

@@ -87,7 +87,7 @@ function evalScopeAttributes() {
   return { [EVAL_CORRELATION_ID_ATTRIBUTE]: scope.correlationId };
 }
 
-// ../core/dist/chunk-WJOR6M7H.js
+// ../core/dist/chunk-I6TVJQEC.js
 var STATE_KEY = /* @__PURE__ */ Symbol.for("raindrop.tracing.replayTraceRoutingState");
 function state() {
   const holder = globalThis;
@@ -2169,6 +2169,158 @@ var TraceShipper = class {
     }
   }
 };
+var PROMPT_TOOLS_ATTRIBUTE = "ai.prompt.tools";
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var JSON_SCHEMA_KEYS = [
+  "type",
+  "properties",
+  "$schema",
+  "$ref",
+  "anyOf",
+  "oneOf",
+  "allOf",
+  "enum",
+  "const",
+  "items",
+  "additionalProperties",
+  "required"
+];
+function isJsonSchema(value) {
+  if (!isRecord(value)) return false;
+  if (typeof value["~standard"] === "object") return false;
+  if (isRecord(value._def) || isRecord(value._zod)) return false;
+  if (Object.keys(value).length === 0) return true;
+  return JSON_SCHEMA_KEYS.some((key) => key in value);
+}
+function toJsonSchema(value, options) {
+  if (value === void 0 || value === null) return void 0;
+  if (isJsonSchema(value)) return value;
+  if (isRecord(value) && isJsonSchema(value.jsonSchema)) return value.jsonSchema;
+  if (isRecord(value) && isJsonSchema(value.json)) return value.json;
+  if (options == null ? void 0 : options.schema) {
+    try {
+      return options.schema(value);
+    } catch (e) {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function pickString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function functionTool(name, description, schema, options) {
+  const tool = { type: "function", name };
+  const desc = pickString(description);
+  if (desc !== void 0) tool.description = desc;
+  const inputSchema = toJsonSchema(schema, options);
+  if (inputSchema !== void 0) tool.inputSchema = inputSchema;
+  return tool;
+}
+function normalizeToolDeclaration(tool, options, fallbackName) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  if (!isRecord(tool)) return void 0;
+  if (tool.type === "provider-defined" || tool.type === "provider") {
+    const name2 = (_b = (_a = pickString(tool.name)) != null ? _a : pickString(tool.id)) != null ? _b : fallbackName;
+    if (name2 === void 0) return void 0;
+    const declaration = { type: "provider-defined", name: name2 };
+    const id = pickString(tool.id);
+    if (id !== void 0) declaration.id = id;
+    if (isRecord(tool.args)) declaration.args = tool.args;
+    return declaration;
+  }
+  if (isRecord(tool.toolSpec)) {
+    const spec = tool.toolSpec;
+    const name2 = (_c = pickString(spec.name)) != null ? _c : fallbackName;
+    if (name2 === void 0) return void 0;
+    return functionTool(name2, spec.description, spec.inputSchema, options);
+  }
+  if (isRecord(tool.function)) {
+    const fn = tool.function;
+    const name2 = (_d = pickString(fn.name)) != null ? _d : fallbackName;
+    if (name2 === void 0) return void 0;
+    return functionTool(name2, fn.description, (_e = fn.parameters) != null ? _e : fn.input_schema, options);
+  }
+  const name = (_g = (_f = pickString(tool.name)) != null ? _f : pickString(tool.id)) != null ? _g : fallbackName;
+  if (name === void 0) return void 0;
+  const type = pickString(tool.type);
+  if (type !== void 0 && type !== "function" && type !== "dynamic" && type !== "custom") {
+    if (!("input_schema" in tool) && !("inputSchema" in tool) && !("parameters" in tool)) {
+      return { type: "provider-defined", id: type, name };
+    }
+  }
+  return functionTool(
+    name,
+    tool.description,
+    (_j = (_i = (_h = tool.inputSchema) != null ? _h : tool.input_schema) != null ? _i : tool.parameters) != null ? _j : tool.schema,
+    options
+  );
+}
+var NOT_A_GEMINI_GROUP_KEYS = ["name", "id", "type", "function", "toolSpec", "cachePoint"];
+function isGeminiToolGroup(tool) {
+  if (Array.isArray(tool.functionDeclarations)) return true;
+  const keys = Object.keys(tool);
+  if (keys.length === 0 || NOT_A_GEMINI_GROUP_KEYS.some((key) => key in tool)) return false;
+  return keys.every((key) => isRecord(tool[key]));
+}
+function expandGeminiTool(tool, options) {
+  const declarations = [];
+  for (const [key, value] of Object.entries(tool)) {
+    if (key === "functionDeclarations" && Array.isArray(value)) {
+      for (const declaration of value) {
+        const normalized = normalizeToolDeclaration(declaration, options);
+        if (normalized) declarations.push(normalized);
+      }
+    } else if (isRecord(value)) {
+      declarations.push({ type: "provider-defined", id: key, name: key, args: value });
+    }
+  }
+  return declarations;
+}
+function normalizeToolDeclarations(tools, options) {
+  if (tools === void 0 || tools === null) return void 0;
+  if (Array.isArray(tools)) {
+    return tools.flatMap((tool) => {
+      if (isRecord(tool) && isGeminiToolGroup(tool)) {
+        return expandGeminiTool(tool, options);
+      }
+      const declaration = normalizeToolDeclaration(tool, options);
+      return declaration ? [declaration] : [];
+    });
+  }
+  if (!isRecord(tools)) return void 0;
+  return Object.entries(tools).flatMap(([key, tool]) => {
+    const declaration = normalizeToolDeclaration(tool, options, key);
+    return declaration ? [declaration] : [];
+  });
+}
+function resolvePromptTools(args) {
+  var _a;
+  if (args.override !== void 0) {
+    return (_a = normalizeToolDeclarations(args.override, args.options)) != null ? _a : [];
+  }
+  return normalizeToolDeclarations(args.inferred, args.options);
+}
+function promptToolsAttribute(tools) {
+  const values = promptToolsAttributeValue(tools);
+  if (values === void 0) return void 0;
+  return {
+    key: PROMPT_TOOLS_ATTRIBUTE,
+    value: { arrayValue: { values: values.map((stringValue) => ({ stringValue })) } }
+  };
+}
+function promptToolsAttributeValue(tools) {
+  if (tools === void 0) return void 0;
+  return tools.map((tool) => {
+    try {
+      return JSON.stringify(tool);
+    } catch (e) {
+      return JSON.stringify({ type: tool.type, name: tool.name });
+    }
+  });
+}
 
 // ../core/dist/index.node.js
 var import_async_hooks = require("async_hooks");
@@ -2345,6 +2497,21 @@ function installTracingSuppressionHook() {
 installTracingSuppressionHook();
 
 // src/handler.ts
+var AGENT_CONFIG_SOURCE = {
+  key: "ai.prompt.tools.source",
+  value: { stringValue: "agent.config" }
+};
+function agentConfigTools(tools) {
+  if (!Array.isArray(tools)) return void 0;
+  return tools.map((tool) => {
+    if (!isRecord2(tool)) return tool;
+    const record = tool;
+    if (typeof record.name === "string" || typeof record.type !== "string") return tool;
+    const { type, ...args } = record;
+    const name = typeof record.server_label === "string" ? record.server_label : type;
+    return { type: "provider-defined", id: type, name, args };
+  });
+}
 var RaindropManagedAgentsHandler = class {
   constructor(events, traces, opts) {
     this.events = events;
@@ -2369,13 +2536,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 +2555,22 @@ 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
+        }
+      };
+      const override = capture.context.tools;
+      const toolsAttr = promptToolsAttribute(
+        resolvePromptTools({ override, inferred: agentConfigTools(session.agent.tools) })
+      );
+      capture.promptToolsOverridden = override !== void 0;
+      capture.promptTools = !toolsAttr ? void 0 : override !== void 0 ? [toolsAttr] : [toolsAttr, AGENT_CONFIG_SOURCE];
       this.cacheSession(session.id, capture);
     } catch (e) {
     }
@@ -2412,7 +2594,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,
@@ -2465,8 +2652,8 @@ var RaindropManagedAgentsHandler = class {
         attrInt("openai.turn.started_at", (_a = turn.started_at) != null ? _a : void 0),
         attrInt("openai.turn.completed_at", (_b = turn.completed_at) != null ? _b : void 0)
       ]);
+      const session = this.sessions.get(turn.session_id);
       if (turn.subagent_id === null) {
-        const session = this.sessions.get(turn.session_id);
         capture.patch.model = session == null ? void 0 : session.model;
         if (!capture.inputFromItem) capture.patch.input = session == null ? void 0 : session.input;
         this.setAttributes(capture.root, [
@@ -2475,6 +2662,9 @@ var RaindropManagedAgentsHandler = class {
           attrString("gen_ai.response.model", session == null ? void 0 : session.model)
         ]);
       }
+      if ((session == null ? void 0 : session.promptTools) && (turn.subagent_id === null || session.promptToolsOverridden)) {
+        this.setAttributes(capture.root, session.promptTools);
+      }
       if (turn.subagent_id)
         capture.patch.properties = {
           ...capture.patch.properties,
@@ -2682,6 +2872,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);
@@ -2710,19 +2919,22 @@ var RaindropManagedAgentsHandler = class {
     this.completed.clear();
   }
 };
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // package.json
 var package_default = {
   name: "@raindrop-ai/openai-managed-agents",
-  version: "0.0.1",
+  version: "0.0.3",
   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 +3005,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 +3044,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 +3064,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

@@ -60,7 +60,7 @@ function evalScopeAttributes() {
   return { [EVAL_CORRELATION_ID_ATTRIBUTE]: scope.correlationId };
 }
 
-// ../core/dist/chunk-WJOR6M7H.js
+// ../core/dist/chunk-I6TVJQEC.js
 var STATE_KEY = /* @__PURE__ */ Symbol.for("raindrop.tracing.replayTraceRoutingState");
 function state() {
   const holder = globalThis;
@@ -2142,6 +2142,158 @@ var TraceShipper = class {
     }
   }
 };
+var PROMPT_TOOLS_ATTRIBUTE = "ai.prompt.tools";
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var JSON_SCHEMA_KEYS = [
+  "type",
+  "properties",
+  "$schema",
+  "$ref",
+  "anyOf",
+  "oneOf",
+  "allOf",
+  "enum",
+  "const",
+  "items",
+  "additionalProperties",
+  "required"
+];
+function isJsonSchema(value) {
+  if (!isRecord(value)) return false;
+  if (typeof value["~standard"] === "object") return false;
+  if (isRecord(value._def) || isRecord(value._zod)) return false;
+  if (Object.keys(value).length === 0) return true;
+  return JSON_SCHEMA_KEYS.some((key) => key in value);
+}
+function toJsonSchema(value, options) {
+  if (value === void 0 || value === null) return void 0;
+  if (isJsonSchema(value)) return value;
+  if (isRecord(value) && isJsonSchema(value.jsonSchema)) return value.jsonSchema;
+  if (isRecord(value) && isJsonSchema(value.json)) return value.json;
+  if (options == null ? void 0 : options.schema) {
+    try {
+      return options.schema(value);
+    } catch (e) {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function pickString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function functionTool(name, description, schema, options) {
+  const tool = { type: "function", name };
+  const desc = pickString(description);
+  if (desc !== void 0) tool.description = desc;
+  const inputSchema = toJsonSchema(schema, options);
+  if (inputSchema !== void 0) tool.inputSchema = inputSchema;
+  return tool;
+}
+function normalizeToolDeclaration(tool, options, fallbackName) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  if (!isRecord(tool)) return void 0;
+  if (tool.type === "provider-defined" || tool.type === "provider") {
+    const name2 = (_b = (_a = pickString(tool.name)) != null ? _a : pickString(tool.id)) != null ? _b : fallbackName;
+    if (name2 === void 0) return void 0;
+    const declaration = { type: "provider-defined", name: name2 };
+    const id = pickString(tool.id);
+    if (id !== void 0) declaration.id = id;
+    if (isRecord(tool.args)) declaration.args = tool.args;
+    return declaration;
+  }
+  if (isRecord(tool.toolSpec)) {
+    const spec = tool.toolSpec;
+    const name2 = (_c = pickString(spec.name)) != null ? _c : fallbackName;
+    if (name2 === void 0) return void 0;
+    return functionTool(name2, spec.description, spec.inputSchema, options);
+  }
+  if (isRecord(tool.function)) {
+    const fn = tool.function;
+    const name2 = (_d = pickString(fn.name)) != null ? _d : fallbackName;
+    if (name2 === void 0) return void 0;
+    return functionTool(name2, fn.description, (_e = fn.parameters) != null ? _e : fn.input_schema, options);
+  }
+  const name = (_g = (_f = pickString(tool.name)) != null ? _f : pickString(tool.id)) != null ? _g : fallbackName;
+  if (name === void 0) return void 0;
+  const type = pickString(tool.type);
+  if (type !== void 0 && type !== "function" && type !== "dynamic" && type !== "custom") {
+    if (!("input_schema" in tool) && !("inputSchema" in tool) && !("parameters" in tool)) {
+      return { type: "provider-defined", id: type, name };
+    }
+  }
+  return functionTool(
+    name,
+    tool.description,
+    (_j = (_i = (_h = tool.inputSchema) != null ? _h : tool.input_schema) != null ? _i : tool.parameters) != null ? _j : tool.schema,
+    options
+  );
+}
+var NOT_A_GEMINI_GROUP_KEYS = ["name", "id", "type", "function", "toolSpec", "cachePoint"];
+function isGeminiToolGroup(tool) {
+  if (Array.isArray(tool.functionDeclarations)) return true;
+  const keys = Object.keys(tool);
+  if (keys.length === 0 || NOT_A_GEMINI_GROUP_KEYS.some((key) => key in tool)) return false;
+  return keys.every((key) => isRecord(tool[key]));
+}
+function expandGeminiTool(tool, options) {
+  const declarations = [];
+  for (const [key, value] of Object.entries(tool)) {
+    if (key === "functionDeclarations" && Array.isArray(value)) {
+      for (const declaration of value) {
+        const normalized = normalizeToolDeclaration(declaration, options);
+        if (normalized) declarations.push(normalized);
+      }
+    } else if (isRecord(value)) {
+      declarations.push({ type: "provider-defined", id: key, name: key, args: value });
+    }
+  }
+  return declarations;
+}
+function normalizeToolDeclarations(tools, options) {
+  if (tools === void 0 || tools === null) return void 0;
+  if (Array.isArray(tools)) {
+    return tools.flatMap((tool) => {
+      if (isRecord(tool) && isGeminiToolGroup(tool)) {
+        return expandGeminiTool(tool, options);
+      }
+      const declaration = normalizeToolDeclaration(tool, options);
+      return declaration ? [declaration] : [];
+    });
+  }
+  if (!isRecord(tools)) return void 0;
+  return Object.entries(tools).flatMap(([key, tool]) => {
+    const declaration = normalizeToolDeclaration(tool, options, key);
+    return declaration ? [declaration] : [];
+  });
+}
+function resolvePromptTools(args) {
+  var _a;
+  if (args.override !== void 0) {
+    return (_a = normalizeToolDeclarations(args.override, args.options)) != null ? _a : [];
+  }
+  return normalizeToolDeclarations(args.inferred, args.options);
+}
+function promptToolsAttribute(tools) {
+  const values = promptToolsAttributeValue(tools);
+  if (values === void 0) return void 0;
+  return {
+    key: PROMPT_TOOLS_ATTRIBUTE,
+    value: { arrayValue: { values: values.map((stringValue) => ({ stringValue })) } }
+  };
+}
+function promptToolsAttributeValue(tools) {
+  if (tools === void 0) return void 0;
+  return tools.map((tool) => {
+    try {
+      return JSON.stringify(tool);
+    } catch (e) {
+      return JSON.stringify({ type: tool.type, name: tool.name });
+    }
+  });
+}
 
 // ../core/dist/index.node.js
 import { AsyncLocalStorage } from "async_hooks";
@@ -2318,6 +2470,21 @@ function installTracingSuppressionHook() {
 installTracingSuppressionHook();
 
 // src/handler.ts
+var AGENT_CONFIG_SOURCE = {
+  key: "ai.prompt.tools.source",
+  value: { stringValue: "agent.config" }
+};
+function agentConfigTools(tools) {
+  if (!Array.isArray(tools)) return void 0;
+  return tools.map((tool) => {
+    if (!isRecord2(tool)) return tool;
+    const record = tool;
+    if (typeof record.name === "string" || typeof record.type !== "string") return tool;
+    const { type, ...args } = record;
+    const name = typeof record.server_label === "string" ? record.server_label : type;
+    return { type: "provider-defined", id: type, name, args };
+  });
+}
 var RaindropManagedAgentsHandler = class {
   constructor(events, traces, opts) {
     this.events = events;
@@ -2342,13 +2509,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 +2528,22 @@ 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
+        }
+      };
+      const override = capture.context.tools;
+      const toolsAttr = promptToolsAttribute(
+        resolvePromptTools({ override, inferred: agentConfigTools(session.agent.tools) })
+      );
+      capture.promptToolsOverridden = override !== void 0;
+      capture.promptTools = !toolsAttr ? void 0 : override !== void 0 ? [toolsAttr] : [toolsAttr, AGENT_CONFIG_SOURCE];
       this.cacheSession(session.id, capture);
     } catch (e) {
     }
@@ -2385,7 +2567,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,
@@ -2438,8 +2625,8 @@ var RaindropManagedAgentsHandler = class {
         attrInt("openai.turn.started_at", (_a = turn.started_at) != null ? _a : void 0),
         attrInt("openai.turn.completed_at", (_b = turn.completed_at) != null ? _b : void 0)
       ]);
+      const session = this.sessions.get(turn.session_id);
       if (turn.subagent_id === null) {
-        const session = this.sessions.get(turn.session_id);
         capture.patch.model = session == null ? void 0 : session.model;
         if (!capture.inputFromItem) capture.patch.input = session == null ? void 0 : session.input;
         this.setAttributes(capture.root, [
@@ -2448,6 +2635,9 @@ var RaindropManagedAgentsHandler = class {
           attrString("gen_ai.response.model", session == null ? void 0 : session.model)
         ]);
       }
+      if ((session == null ? void 0 : session.promptTools) && (turn.subagent_id === null || session.promptToolsOverridden)) {
+        this.setAttributes(capture.root, session.promptTools);
+      }
       if (turn.subagent_id)
         capture.patch.properties = {
           ...capture.patch.properties,
@@ -2655,6 +2845,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);
@@ -2683,19 +2892,22 @@ var RaindropManagedAgentsHandler = class {
     this.completed.clear();
   }
 };
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // package.json
 var package_default = {
   name: "@raindrop-ai/openai-managed-agents",
-  version: "0.0.1",
+  version: "0.0.3",
   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 +2978,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 +3017,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 +3037,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.3",
   "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": {
     ".": {
@@ -38,7 +38,7 @@
     "vitest": "^2.1.9",
     "openai": "7.15.0",
     "zod": "^3.23.8",
-    "@raindrop-ai/core": "0.3.0"
+    "@raindrop-ai/core": "0.3.1"
   },
   "tsup": {
     "entry": [