@raindrop-ai/opencode-plugin 0.3.0 → 0.3.1

package/dist/{self-diagnostics-NiAq-SZ8.d.ts → self-diagnostics-CLW6h4zB.d.ts}

@@ -85,6 +85,32 @@ 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 SelfDiagnosticsSignalDefinition = {
     /**
@@ -119,4 +145,4 @@ type SelfDiagnosticsOptions = {
     toolName?: string;
 };
 
-export type { AppGitOptions as A, IdentifyInput as I, SelfDiagnosticsOptions as S, SelfDiagnosticsSignalDefinition as a, SelfDiagnosticsSignalDefinitions as b, SignalInput as c };
+export type { AppGitOptions as A, IdentifyInput as I, PromptToolsOverride as P, SelfDiagnosticsOptions as S, SelfDiagnosticsSignalDefinition as a, SelfDiagnosticsSignalDefinitions as b, SignalInput as c };

package/dist/v2.cjs

@@ -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;
@@ -2096,6 +2096,151 @@ 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 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");
@@ -2310,15 +2455,16 @@ function loadConfig(projectDirectory) {
     eventMetadata,
     localWorkshopUrl: resolveLocalWorkshopUrl(merged.local_workshop_url),
     appGit: mapAppGit(merged.app_git),
-    selfDiagnostics: mapSelfDiagnostics(merged.self_diagnostics)
+    selfDiagnostics: mapSelfDiagnostics(merged.self_diagnostics),
+    tools: Array.isArray(merged.tools) ? merged.tools : void 0
   };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mapSelfDiagnostics(value) {
   const env = process.env["RAINDROP_SELF_DIAGNOSTICS"];
-  const record = isRecord(value) ? value : {};
+  const record = isRecord2(value) ? value : {};
   const enabled = env !== void 0 ? env === "true" : typeof record["enabled"] === "boolean" ? record["enabled"] : void 0;
   const signals = mapSelfDiagnosticsSignals(record["signals"]);
   const options = {
@@ -2330,10 +2476,10 @@ function mapSelfDiagnostics(value) {
   return Object.keys(options).length > 0 ? options : void 0;
 }
 function mapSelfDiagnosticsSignals(value) {
-  if (!isRecord(value)) return void 0;
+  if (!isRecord2(value)) return void 0;
   const out = {};
   for (const [key, entry] of Object.entries(value)) {
-    if (!isRecord(entry)) continue;
+    if (!isRecord2(entry)) continue;
     const definition = entry;
     if (typeof definition["description"] !== "string") continue;
     const sentiment = definition["sentiment"];
@@ -2370,7 +2516,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.3.0",
+  version: "0.3.1",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -2580,13 +2726,13 @@ function selfDiagnosticsInputJsonSchema(config) {
     additionalProperties: false
   };
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function trackSelfDiagnosticsSignal(toolInput, config, eventShipper, eventId, debug) {
   var _a, _b;
   try {
-    const input = isRecord2(toolInput) ? toolInput : void 0;
+    const input = isRecord3(toolInput) ? toolInput : void 0;
     const fallbackCategory = (_a = config.signalKeys[0]) != null ? _a : "unknown";
     const categoryCandidate = normalizeString(input == null ? void 0 : input["category"]);
     const category = categoryCandidate && config.signalKeySet.has(categoryCandidate) ? categoryCandidate : fallbackCategory;
@@ -2673,6 +2819,100 @@ var TraceShipper3 = class extends TraceShipper2 {
   }
 };
 
+// src/tool-catalog.ts
+var PROMPT_TOOLS_SOURCE_ATTRIBUTE = "ai.prompt.tools.source";
+var OPENCODE_TOOL_LIST_SOURCE = "opencode.tool.list";
+var TOOL_CATALOG_TIMEOUT_MS = 2e3;
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function catalogItems(raw) {
+  var _a;
+  const list = Array.isArray(raw) ? raw : isRecord4(raw) && Array.isArray(raw.data) ? raw.data : void 0;
+  if (!list) return void 0;
+  const items = [];
+  for (const item of list) {
+    if (!isRecord4(item)) continue;
+    const name = typeof item.id === "string" ? item.id : typeof item.name === "string" ? item.name : void 0;
+    if (!name) continue;
+    const schema = (_a = item.parameters) != null ? _a : item.input;
+    items.push({
+      type: "function",
+      name,
+      ...typeof item.description === "string" ? { description: item.description } : {},
+      ...isJsonSchema(schema) ? { inputSchema: schema } : {}
+    });
+  }
+  return items;
+}
+function withTimeout(promise, ms) {
+  return new Promise((resolve2) => {
+    const timer = setTimeout(() => resolve2(void 0), ms);
+    if (typeof timer === "object" && "unref" in timer) timer.unref();
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve2(value);
+      },
+      () => {
+        clearTimeout(timer);
+        resolve2(void 0);
+      }
+    );
+  });
+}
+function createToolCatalog(options = {}) {
+  var _a, _b;
+  const override = options.override !== void 0 ? { tools: (_a = normalizeToolDeclarations(options.override)) != null ? _a : [] } : void 0;
+  const timeoutMs = (_b = options.timeoutMs) != null ? _b : TOOL_CATALOG_TIMEOUT_MS;
+  const cache = /* @__PURE__ */ new Map();
+  async function lookup(query) {
+    const fetch2 = options.fetch;
+    if (!fetch2) return void 0;
+    let raw;
+    try {
+      raw = await withTimeout(Promise.resolve().then(() => fetch2(query)), timeoutMs);
+    } catch (error) {
+      if (options.debug) console.log(`[raindrop-ai/opencode-plugin] tool catalog lookup failed: ${String(error)}`);
+      return void 0;
+    }
+    const tools = normalizeToolDeclarations(catalogItems(raw));
+    if (!tools) {
+      if (options.debug) console.log("[raindrop-ai/opencode-plugin] tool catalog lookup returned no tool list");
+      return void 0;
+    }
+    return { tools, source: OPENCODE_TOOL_LIST_SOURCE };
+  }
+  return {
+    resolve(sessionID, query) {
+      if (override) return Promise.resolve(override);
+      if (!options.fetch) return Promise.resolve(void 0);
+      let perSession = cache.get(sessionID);
+      if (!perSession) {
+        perSession = /* @__PURE__ */ new Map();
+        cache.set(sessionID, perSession);
+      }
+      const key = `${query.provider}\0${query.model}`;
+      let pending = perSession.get(key);
+      if (!pending) {
+        pending = lookup(query).catch(() => void 0);
+        perSession.set(key, pending);
+      }
+      return pending;
+    },
+    forget(sessionID) {
+      cache.delete(sessionID);
+    }
+  };
+}
+function promptToolsAttributes(resolved) {
+  if (!resolved) return [];
+  return [
+    promptToolsAttribute(resolved.tools),
+    resolved.source !== void 0 ? attrString(PROMPT_TOOLS_SOURCE_ATTRIBUTE, resolved.source) : void 0
+  ];
+}
+
 // src/tracing-v2.ts
 var import_node_os2 = require("os");
 
@@ -2846,7 +3086,7 @@ function errorString(error) {
 
 type: ${error.type}`;
 }
-function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
+function createV2Tracing(config, eventShipper, traceShipper, sessionLookup, toolCatalog) {
   const sessions = /* @__PURE__ */ new Map();
   const admittedPrompts = /* @__PURE__ */ new Map();
   const subagentLinks = /* @__PURE__ */ new Map();
@@ -2886,7 +3126,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
   async function finalizeTurn(state2, error) {
     var _a, _b, _c;
     for (const step of state2.stepSpans.values()) {
-      traceShipper.endSpan(step.span);
+      traceShipper.endSpan(step.span, { attributes: promptToolsAttributes(await step.promptTools) });
     }
     state2.stepSpans.clear();
     if (state2.compactionSpan) {
@@ -3141,7 +3381,13 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         state2.stepSpans.set(data.assistantMessageID, {
           span,
           providerID: data.model.providerID,
-          modelID: data.model.id
+          modelID: data.model.id,
+          // Kicked off here, awaited when the step closes: the lookup (bounded
+          // by its timeout) never delays the events streamed during the step.
+          promptTools: toolCatalog ? toolCatalog.resolve(data.sessionID, {
+            provider: data.model.providerID,
+            model: data.model.id
+          }) : Promise.resolve(void 0)
         });
         break;
       }
@@ -3172,6 +3418,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         if (reasoning !== void 0) {
           attrs.push(attrString("ai.reasoning.text", reasoning));
         }
+        attrs.push(...promptToolsAttributes(await step.promptTools));
         traceShipper.endSpan(step.span, { attributes: attrs });
         break;
       }
@@ -3181,7 +3428,10 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         const step = state2 == null ? void 0 : state2.stepSpans.get(data.assistantMessageID);
         if (!state2 || !step) return;
         state2.stepSpans.delete(data.assistantMessageID);
-        traceShipper.endSpan(step.span, { error: errorString(data.error) });
+        traceShipper.endSpan(step.span, {
+          error: errorString(data.error),
+          attributes: promptToolsAttributes(await step.promptTools)
+        });
         break;
       }
       case "session.text.ended": {
@@ -3357,6 +3607,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
           }
         }
         sessions.delete(event.data.sessionID);
+        toolCatalog == null ? void 0 : toolCatalog.forget(event.data.sessionID);
         break;
       }
     }
@@ -3434,7 +3685,7 @@ function raindrop(opts = {}) {
     }
   }
   function createShared(ctx) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const config = loadConfig((_a = opts.directory) != null ? _a : ctx.location.directory);
     const resolvedLocalUrl = resolveLocalDebuggerBaseUrl(config.localWorkshopUrl);
     const hasLocalDestination = resolvedLocalUrl !== null;
@@ -3484,12 +3735,24 @@ function raindrop(opts = {}) {
       appGitContext,
       abort: new AbortController(),
       instances: /* @__PURE__ */ new Set(),
-      runtime: createV2Tracing(config, eventShipper, traceShipper, async (sessionID) => {
-        const instance = firstInstance(s);
-        if (!instance) return void 0;
-        const info = await instance.ctx.session.get({ sessionID });
-        return { parentID: info.parentID };
-      })
+      runtime: createV2Tracing(
+        config,
+        eventShipper,
+        traceShipper,
+        async (sessionID) => {
+          const instance = firstInstance(s);
+          if (!instance) return void 0;
+          const info = await instance.ctx.session.get({ sessionID });
+          return { parentID: info.parentID };
+        },
+        createToolCatalog({
+          override: (_e = opts.tools) != null ? _e : config.tools,
+          // v2 exposes no per-model catalog endpoint; the registered tool list
+          // (after every plugin transform) is the closest observable catalog.
+          fetch: () => ctx.tool.list(),
+          debug: config.debug
+        })
+      )
     };
     return s;
   }

package/dist/v2.d.cts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode/plugin';
-import { I as IdentifyInput, c as SignalInput, A as AppGitOptions, S as SelfDiagnosticsOptions } from './self-diagnostics-NiAq-SZ8.cjs';
-export { a as SelfDiagnosticsSignalDefinition, b as SelfDiagnosticsSignalDefinitions } from './self-diagnostics-NiAq-SZ8.cjs';
+import { I as IdentifyInput, c as SignalInput, A as AppGitOptions, S as SelfDiagnosticsOptions, P as PromptToolsOverride } from './self-diagnostics-CLW6h4zB.cjs';
+export { a as SelfDiagnosticsSignalDefinition, b as SelfDiagnosticsSignalDefinitions } from './self-diagnostics-CLW6h4zB.cjs';
 
 interface RaindropOpencodeV2Options {
     /** Application Git identity override. false disables enrichment. */
@@ -9,6 +9,11 @@ interface RaindropOpencodeV2Options {
     directory?: string;
     /** Built-in self-diagnostics: injects a `__raindrop_report` tool when enabled. */
     selfDiagnostics?: SelfDiagnosticsOptions;
+    /**
+     * Overrides the tool catalog recorded as `ai.prompt.tools` on every model
+     * span; skips the OpenCode `ctx.tool.list()` lookup entirely.
+     */
+    tools?: PromptToolsOverride;
 }
 /**
  * The Raindrop control handle exposed on the v2 plugin. Unlike v1 (where the

package/dist/v2.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode/plugin';
-import { I as IdentifyInput, c as SignalInput, A as AppGitOptions, S as SelfDiagnosticsOptions } from './self-diagnostics-NiAq-SZ8.js';
-export { a as SelfDiagnosticsSignalDefinition, b as SelfDiagnosticsSignalDefinitions } from './self-diagnostics-NiAq-SZ8.js';
+import { I as IdentifyInput, c as SignalInput, A as AppGitOptions, S as SelfDiagnosticsOptions, P as PromptToolsOverride } from './self-diagnostics-CLW6h4zB.js';
+export { a as SelfDiagnosticsSignalDefinition, b as SelfDiagnosticsSignalDefinitions } from './self-diagnostics-CLW6h4zB.js';
 
 interface RaindropOpencodeV2Options {
     /** Application Git identity override. false disables enrichment. */
@@ -9,6 +9,11 @@ interface RaindropOpencodeV2Options {
     directory?: string;
     /** Built-in self-diagnostics: injects a `__raindrop_report` tool when enabled. */
     selfDiagnostics?: SelfDiagnosticsOptions;
+    /**
+     * Overrides the tool catalog recorded as `ai.prompt.tools` on every model
+     * span; skips the OpenCode `ctx.tool.list()` lookup entirely.
+     */
+    tools?: PromptToolsOverride;
 }
 /**
  * The Raindrop control handle exposed on the v2 plugin. Unlike v1 (where the

package/dist/v2.js

@@ -9,13 +9,15 @@ import {
   buildLlmGenAiAttributes,
   capText,
   createAppGitContext,
+  createToolCatalog,
   generateId,
   loadConfig,
   normalizeSelfDiagnosticsConfig,
+  promptToolsAttributes,
   resolveLocalDebuggerBaseUrl,
   selfDiagnosticsInputJsonSchema,
   trackSelfDiagnosticsSignal
-} from "./chunk-FCORH4YS.js";
+} from "./chunk-ZG47FVK7.js";
 
 // src/v2.ts
 import { Plugin } from "@opencode/plugin";
@@ -70,7 +72,7 @@ function errorString(error) {
 
 type: ${error.type}`;
 }
-function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
+function createV2Tracing(config, eventShipper, traceShipper, sessionLookup, toolCatalog) {
   const sessions = /* @__PURE__ */ new Map();
   const admittedPrompts = /* @__PURE__ */ new Map();
   const subagentLinks = /* @__PURE__ */ new Map();
@@ -110,7 +112,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
   async function finalizeTurn(state, error) {
     var _a, _b, _c;
     for (const step of state.stepSpans.values()) {
-      traceShipper.endSpan(step.span);
+      traceShipper.endSpan(step.span, { attributes: promptToolsAttributes(await step.promptTools) });
     }
     state.stepSpans.clear();
     if (state.compactionSpan) {
@@ -365,7 +367,13 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         state.stepSpans.set(data.assistantMessageID, {
           span,
           providerID: data.model.providerID,
-          modelID: data.model.id
+          modelID: data.model.id,
+          // Kicked off here, awaited when the step closes: the lookup (bounded
+          // by its timeout) never delays the events streamed during the step.
+          promptTools: toolCatalog ? toolCatalog.resolve(data.sessionID, {
+            provider: data.model.providerID,
+            model: data.model.id
+          }) : Promise.resolve(void 0)
         });
         break;
       }
@@ -396,6 +404,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         if (reasoning !== void 0) {
           attrs.push(attrString("ai.reasoning.text", reasoning));
         }
+        attrs.push(...promptToolsAttributes(await step.promptTools));
         traceShipper.endSpan(step.span, { attributes: attrs });
         break;
       }
@@ -405,7 +414,10 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
         const step = state == null ? void 0 : state.stepSpans.get(data.assistantMessageID);
         if (!state || !step) return;
         state.stepSpans.delete(data.assistantMessageID);
-        traceShipper.endSpan(step.span, { error: errorString(data.error) });
+        traceShipper.endSpan(step.span, {
+          error: errorString(data.error),
+          attributes: promptToolsAttributes(await step.promptTools)
+        });
         break;
       }
       case "session.text.ended": {
@@ -581,6 +593,7 @@ function createV2Tracing(config, eventShipper, traceShipper, sessionLookup) {
           }
         }
         sessions.delete(event.data.sessionID);
+        toolCatalog == null ? void 0 : toolCatalog.forget(event.data.sessionID);
         break;
       }
     }
@@ -658,7 +671,7 @@ function raindrop(opts = {}) {
     }
   }
   function createShared(ctx) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const config = loadConfig((_a = opts.directory) != null ? _a : ctx.location.directory);
     const resolvedLocalUrl = resolveLocalDebuggerBaseUrl(config.localWorkshopUrl);
     const hasLocalDestination = resolvedLocalUrl !== null;
@@ -708,12 +721,24 @@ function raindrop(opts = {}) {
       appGitContext,
       abort: new AbortController(),
       instances: /* @__PURE__ */ new Set(),
-      runtime: createV2Tracing(config, eventShipper, traceShipper, async (sessionID) => {
-        const instance = firstInstance(s);
-        if (!instance) return void 0;
-        const info = await instance.ctx.session.get({ sessionID });
-        return { parentID: info.parentID };
-      })
+      runtime: createV2Tracing(
+        config,
+        eventShipper,
+        traceShipper,
+        async (sessionID) => {
+          const instance = firstInstance(s);
+          if (!instance) return void 0;
+          const info = await instance.ctx.session.get({ sessionID });
+          return { parentID: info.parentID };
+        },
+        createToolCatalog({
+          override: (_e = opts.tools) != null ? _e : config.tools,
+          // v2 exposes no per-model catalog endpoint; the registered tool list
+          // (after every plugin transform) is the closest observable catalog.
+          fetch: () => ctx.tool.list(),
+          debug: config.debug
+        })
+      )
     };
     return s;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/opencode-plugin",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Raindrop observability plugin for OpenCode — automatic session/event/span tracing",
   "type": "module",
   "main": "dist/index.js",
@@ -55,7 +55,7 @@
     "@types/node": "^20.11.17",
     "tsup": "^8.4.0",
     "typescript": "^5.3.3",
-    "@raindrop-ai/core": "0.3.0"
+    "@raindrop-ai/core": "0.3.1"
   },
   "tsup": {
     "entry": [