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

package/README.md

@@ -120,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

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;
@@ -569,4 +602,5 @@ type RaindropOpenAIManagedAgentsClient = {
 };
 declare function createRaindropOpenAIManagedAgents(opts?: OpenAIManagedAgentsOptions): RaindropOpenAIManagedAgentsClient;
 
-export { type OpenAIManagedAgentsOptions, RaindropManagedAgentsHandler, type RaindropOpenAIManagedAgentsClient, type SessionContext, createRaindropOpenAIManagedAgents };
+export { RaindropManagedAgentsHandler, createRaindropOpenAIManagedAgents };
+export type { OpenAIManagedAgentsOptions, RaindropOpenAIManagedAgentsClient, SessionContext };

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;
@@ -569,4 +602,5 @@ type RaindropOpenAIManagedAgentsClient = {
 };
 declare function createRaindropOpenAIManagedAgents(opts?: OpenAIManagedAgentsOptions): RaindropOpenAIManagedAgentsClient;
 
-export { type OpenAIManagedAgentsOptions, RaindropManagedAgentsHandler, type RaindropOpenAIManagedAgentsClient, type SessionContext, createRaindropOpenAIManagedAgents };
+export { RaindropManagedAgentsHandler, createRaindropOpenAIManagedAgents };
+export type { OpenAIManagedAgentsOptions, RaindropOpenAIManagedAgentsClient, SessionContext };

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-QH6U6QYP.js
 var STATE_KEY = /* @__PURE__ */ Symbol.for("raindrop.tracing.replayTraceRoutingState");
 function state() {
   const holder = globalThis;
@@ -1648,12 +1648,41 @@ var REDACTED_PLACEHOLDER = "[REDACTED]";
 function normalizeKeyName(name) {
   return name.toLowerCase().replace(/[-_.]/g, "");
 }
+var URL_USERINFO = new RegExp(
+  String.raw`\b([a-z][a-z0-9+.-]{0,${DEFAULT_MAX_TEXT_FIELD_CHARS - 1}})(?::\/\/([^\s/?#]{1,${DEFAULT_MAX_TEXT_FIELD_CHARS}})@)?`,
+  "gi"
+);
+var URL_QUERY_PARAM = /([?&#]([A-Za-z0-9_.\-]+)=)[^&#?\s"']*/g;
+var URL_SECRET_QUERY_KEYS = /* @__PURE__ */ new Set([
+  "token",
+  "secret",
+  "sig",
+  "signature",
+  "awsaccesskeyid",
+  "xamzsignature",
+  "xamzcredential",
+  "xamzsecuritytoken",
+  "xgoogsignature"
+]);
+var DEFAULT_SECRET_SET = buildSecretSet(DEFAULT_SECRET_KEY_NAMES);
+function redactUrlSecrets(text, secretSet = DEFAULT_SECRET_SET, placeholder = REDACTED_PLACEHOLDER) {
+  if (text.length > DEFAULT_MAX_TEXT_FIELD_CHARS) return placeholder;
+  if (!text.includes("://") && !text.includes("=")) return text;
+  return text.replace(
+    URL_USERINFO,
+    (whole, scheme, userinfo) => userinfo === void 0 ? whole : `${scheme}://${placeholder}@`
+  ).replace(URL_QUERY_PARAM, (whole, prefix, key) => {
+    const normalized = normalizeKeyName(key);
+    return secretSet.has(normalized) || URL_SECRET_QUERY_KEYS.has(normalized) ? `${prefix}${placeholder}` : whole;
+  });
+}
 function redactSecretsInObject(value, options) {
   var _a, _b;
   const normalizedSecretSet = buildSecretSet((_a = options == null ? void 0 : options.secretKeyNames) != null ? _a : DEFAULT_SECRET_KEY_NAMES);
   const placeholder = (_b = options == null ? void 0 : options.placeholder) != null ? _b : REDACTED_PLACEHOLDER;
   const seen = /* @__PURE__ */ new WeakSet();
   const walk = (node) => {
+    if (typeof node === "string") return redactUrlSecrets(node, normalizedSecretSet, placeholder);
     if (node === null || typeof node !== "object") return node;
     if (seen.has(node)) return "[CIRCULAR]";
     seen.add(node);
@@ -2169,6 +2198,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 +2526,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;
@@ -2398,6 +2594,12 @@ var RaindropManagedAgentsHandler = class {
           ...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) {
     }
@@ -2479,8 +2681,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, [
@@ -2489,6 +2691,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,
@@ -2743,11 +2948,14 @@ 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.2",
+  version: "0.0.4",
   description: "Raindrop tracing for the OpenAI Agents API",
   main: "dist/index.js",
   module: "dist/index.mjs",
@@ -2789,11 +2997,11 @@ var package_default = {
     "@raindrop-ai/core": "workspace:*",
     "@types/node": "^20.11.17",
     msw: "^2.12.7",
-    tsup: "^8.4.0",
+    tsup: "^9.0.0",
     typescript: "^5.3.3",
-    vitest: "^2.1.9",
+    vitest: "^4.1.12",
     openai: "7.15.0",
-    zod: "^3.23.8"
+    zod: "^4.6.6"
   },
   tsup: {
     entry: [

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-QH6U6QYP.js
 var STATE_KEY = /* @__PURE__ */ Symbol.for("raindrop.tracing.replayTraceRoutingState");
 function state() {
   const holder = globalThis;
@@ -1621,12 +1621,41 @@ var REDACTED_PLACEHOLDER = "[REDACTED]";
 function normalizeKeyName(name) {
   return name.toLowerCase().replace(/[-_.]/g, "");
 }
+var URL_USERINFO = new RegExp(
+  String.raw`\b([a-z][a-z0-9+.-]{0,${DEFAULT_MAX_TEXT_FIELD_CHARS - 1}})(?::\/\/([^\s/?#]{1,${DEFAULT_MAX_TEXT_FIELD_CHARS}})@)?`,
+  "gi"
+);
+var URL_QUERY_PARAM = /([?&#]([A-Za-z0-9_.\-]+)=)[^&#?\s"']*/g;
+var URL_SECRET_QUERY_KEYS = /* @__PURE__ */ new Set([
+  "token",
+  "secret",
+  "sig",
+  "signature",
+  "awsaccesskeyid",
+  "xamzsignature",
+  "xamzcredential",
+  "xamzsecuritytoken",
+  "xgoogsignature"
+]);
+var DEFAULT_SECRET_SET = buildSecretSet(DEFAULT_SECRET_KEY_NAMES);
+function redactUrlSecrets(text, secretSet = DEFAULT_SECRET_SET, placeholder = REDACTED_PLACEHOLDER) {
+  if (text.length > DEFAULT_MAX_TEXT_FIELD_CHARS) return placeholder;
+  if (!text.includes("://") && !text.includes("=")) return text;
+  return text.replace(
+    URL_USERINFO,
+    (whole, scheme, userinfo) => userinfo === void 0 ? whole : `${scheme}://${placeholder}@`
+  ).replace(URL_QUERY_PARAM, (whole, prefix, key) => {
+    const normalized = normalizeKeyName(key);
+    return secretSet.has(normalized) || URL_SECRET_QUERY_KEYS.has(normalized) ? `${prefix}${placeholder}` : whole;
+  });
+}
 function redactSecretsInObject(value, options) {
   var _a, _b;
   const normalizedSecretSet = buildSecretSet((_a = options == null ? void 0 : options.secretKeyNames) != null ? _a : DEFAULT_SECRET_KEY_NAMES);
   const placeholder = (_b = options == null ? void 0 : options.placeholder) != null ? _b : REDACTED_PLACEHOLDER;
   const seen = /* @__PURE__ */ new WeakSet();
   const walk = (node) => {
+    if (typeof node === "string") return redactUrlSecrets(node, normalizedSecretSet, placeholder);
     if (node === null || typeof node !== "object") return node;
     if (seen.has(node)) return "[CIRCULAR]";
     seen.add(node);
@@ -2142,6 +2171,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 +2499,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;
@@ -2371,6 +2567,12 @@ var RaindropManagedAgentsHandler = class {
           ...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) {
     }
@@ -2452,8 +2654,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, [
@@ -2462,6 +2664,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,
@@ -2716,11 +2921,14 @@ 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.2",
+  version: "0.0.4",
   description: "Raindrop tracing for the OpenAI Agents API",
   main: "dist/index.js",
   module: "dist/index.mjs",
@@ -2762,11 +2970,11 @@ var package_default = {
     "@raindrop-ai/core": "workspace:*",
     "@types/node": "^20.11.17",
     msw: "^2.12.7",
-    tsup: "^8.4.0",
+    tsup: "^9.0.0",
     typescript: "^5.3.3",
-    vitest: "^2.1.9",
+    vitest: "^4.1.12",
     openai: "7.15.0",
-    zod: "^3.23.8"
+    zod: "^4.6.6"
   },
   tsup: {
     entry: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/openai-managed-agents",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Raindrop tracing for the OpenAI Agents API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,12 +33,12 @@
   "devDependencies": {
     "@types/node": "^20.11.17",
     "msw": "^2.12.7",
-    "tsup": "^8.4.0",
+    "tsup": "^9.0.0",
     "typescript": "^5.3.3",
-    "vitest": "^2.1.9",
+    "vitest": "^4.1.12",
     "openai": "7.15.0",
-    "zod": "^3.23.8",
-    "@raindrop-ai/core": "0.3.0"
+    "zod": "^4.6.6",
+    "@raindrop-ai/core": "0.3.2"
   },
   "tsup": {
     "entry": [