@raindrop-ai/opencode-plugin 0.3.0 → 0.3.1

package/dist/index.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 tool2 = { type: "function", name };
+  const desc = pickString(description);
+  if (desc !== void 0) tool2.description = desc;
+  const inputSchema = toJsonSchema(schema, options);
+  if (inputSchema !== void 0) tool2.inputSchema = inputSchema;
+  return tool2;
+}
+function normalizeToolDeclaration(tool2, options, fallbackName) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  if (!isRecord(tool2)) return void 0;
+  if (tool2.type === "provider-defined" || tool2.type === "provider") {
+    const name2 = (_b = (_a = pickString(tool2.name)) != null ? _a : pickString(tool2.id)) != null ? _b : fallbackName;
+    if (name2 === void 0) return void 0;
+    const declaration = { type: "provider-defined", name: name2 };
+    const id = pickString(tool2.id);
+    if (id !== void 0) declaration.id = id;
+    if (isRecord(tool2.args)) declaration.args = tool2.args;
+    return declaration;
+  }
+  if (isRecord(tool2.toolSpec)) {
+    const spec = tool2.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(tool2.function)) {
+    const fn = tool2.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(tool2.name)) != null ? _f : pickString(tool2.id)) != null ? _g : fallbackName;
+  if (name === void 0) return void 0;
+  const type = pickString(tool2.type);
+  if (type !== void 0 && type !== "function" && type !== "dynamic" && type !== "custom") {
+    if (!("input_schema" in tool2) && !("inputSchema" in tool2) && !("parameters" in tool2)) {
+      return { type: "provider-defined", id: type, name };
+    }
+  }
+  return functionTool(
+    name,
+    tool2.description,
+    (_j = (_i = (_h = tool2.inputSchema) != null ? _h : tool2.input_schema) != null ? _i : tool2.parameters) != null ? _j : tool2.schema,
+    options
+  );
+}
+var NOT_A_GEMINI_GROUP_KEYS = ["name", "id", "type", "function", "toolSpec", "cachePoint"];
+function isGeminiToolGroup(tool2) {
+  if (Array.isArray(tool2.functionDeclarations)) return true;
+  const keys = Object.keys(tool2);
+  if (keys.length === 0 || NOT_A_GEMINI_GROUP_KEYS.some((key) => key in tool2)) return false;
+  return keys.every((key) => isRecord(tool2[key]));
+}
+function expandGeminiTool(tool2, options) {
+  const declarations = [];
+  for (const [key, value] of Object.entries(tool2)) {
+    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((tool2) => {
+      if (isRecord(tool2) && isGeminiToolGroup(tool2)) {
+        return expandGeminiTool(tool2, options);
+      }
+      const declaration = normalizeToolDeclaration(tool2, options);
+      return declaration ? [declaration] : [];
+    });
+  }
+  if (!isRecord(tools)) return void 0;
+  return Object.entries(tools).flatMap(([key, tool2]) => {
+    const declaration = normalizeToolDeclaration(tool2, 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((tool2) => {
+    try {
+      return JSON.stringify(tool2);
+    } catch (e) {
+      return JSON.stringify({ type: tool2.type, name: tool2.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",
@@ -2562,13 +2708,13 @@ Categories:
   };
 }
 var SELF_DIAGNOSTICS_ACK = '{"acknowledged":true}';
-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;
@@ -2655,6 +2801,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.ts
 var import_node_os2 = require("os");
 
@@ -2950,7 +3190,7 @@ function getHostname() {
     return h;
   }
 }
-function createTracing(config, worktree, directory, eventShipper, traceShipper) {
+function createTracing(config, worktree, directory, eventShipper, traceShipper, toolCatalog) {
   function log(msg, data) {
     if (!config.debug) return;
     const prefix = `[raindrop-ai/opencode-plugin] [info] ${msg}`;
@@ -2977,6 +3217,14 @@ function createTracing(config, worktree, directory, eventShipper, traceShipper)
     log
   });
   const hooks = {
+    // Fires before each model call with the model already resolved: start the
+    // catalog lookup now so the span attributes rarely wait on it later.
+    "chat.params": async (input) => {
+      void (toolCatalog == null ? void 0 : toolCatalog.resolve(input.sessionID, {
+        provider: input.model.providerID,
+        model: input.model.id
+      }));
+    },
     // ------------------------------------------------------------------
     // event — session lifecycle + streaming parts
     // ------------------------------------------------------------------
@@ -3101,6 +3349,9 @@ function createTracing(config, worktree, directory, eventShipper, traceShipper)
               "message.updated: providerID and modelID are required non-empty strings"
             );
           const modelName = `${providerID}/${modelID}`;
+          const promptTools = promptToolsAttributes(
+            await (toolCatalog == null ? void 0 : toolCatalog.resolve(String(msgSessionID), { provider: providerID, model: modelID }))
+          );
           const finishReason = info2["finish"];
           const outputText = state2.outputParts.get(messageId);
           const reasoningText = state2.reasoningParts.get(messageId);
@@ -3126,7 +3377,8 @@ type: ${name != null ? name : "UnknownError"}`;
             const llmAttrs = [
               attrString("ai.operationId", "generateText"),
               attrString("ai.response.text", responseText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (state2.currentSystemPrompt) {
               llmAttrs.push(
@@ -3162,7 +3414,8 @@ type: ${name != null ? name : "UnknownError"}`;
                 buildPromptMessages(state2.currentSystemPrompt, state2.currentInput)
               ),
               attrString("ai.response.text", turnOutputText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (state2.currentSystemPrompt) {
               llmAttrs.push(
@@ -3207,7 +3460,8 @@ type: ${name != null ? name : "UnknownError"}`;
                 buildPromptMessages(state2.currentSystemPrompt, state2.currentInput)
               ),
               attrString("ai.response.text", turnOutputText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (isCompaction) {
               rootAttrs.push(attrString("is_compaction", "true"));
@@ -3273,6 +3527,7 @@ type: ${name != null ? name : "UnknownError"}`;
           if (state2.parentId) {
             cleanupSessionParentMap(String(sessionID));
             sessions.delete(String(sessionID));
+            toolCatalog == null ? void 0 : toolCatalog.forget(String(sessionID));
           } else {
           }
         } else if (event.type === "session.deleted") {
@@ -3289,6 +3544,7 @@ type: ${name != null ? name : "UnknownError"}`;
           cleanupSessionParentMap(String(sessionID));
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(sessionID));
+          toolCatalog == null ? void 0 : toolCatalog.forget(String(sessionID));
         } else if (event.type === "session.error") {
           const errorSessionID = (_h = props["sessionID"]) != null ? _h : sessionID;
           if (errorSessionID === void 0 || errorSessionID === "")
@@ -3314,6 +3570,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
           cleanupSessionParentMap(String(errorSessionID));
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(errorSessionID));
+          toolCatalog == null ? void 0 : toolCatalog.forget(String(errorSessionID));
         }
       } catch (err) {
         rateLimitedErrorLog(
@@ -3625,7 +3882,7 @@ function createRaindropHandle(eventShipper, traceShipper, appGitContext, current
   };
 }
 async function plugin(input, opts = {}) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const config = loadConfig(input.directory);
   function appLog(level, message) {
     console.log(`[raindrop-ai/opencode-plugin] [${level}] ${message}`);
@@ -3669,16 +3926,22 @@ async function plugin(input, opts = {}) {
     appGitContext
   });
   const worktree = (_c = input.worktree) != null ? _c : input.directory;
+  const toolCatalog = createToolCatalog({
+    override: (_d = opts.tools) != null ? _d : config.tools,
+    fetch: (query) => input.client.tool.list({ query }),
+    debug: config.debug
+  });
   const tracing = createTracing(
     config,
     worktree,
     input.directory,
     eventShipper,
-    traceShipper
+    traceShipper,
+    toolCatalog
   );
   const hooks = tracing.hooks;
   const selfDiagnostics = normalizeSelfDiagnosticsConfig(
-    (_d = opts.selfDiagnostics) != null ? _d : config.selfDiagnostics
+    (_e = opts.selfDiagnostics) != null ? _e : config.selfDiagnostics
   );
   if (selfDiagnostics && !config.writeKey.trim()) {
     appLog(

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { I as IdentifyInput, 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, 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';
 import { Hooks, PluginInput } from '@opencode-ai/plugin';
 
 interface RaindropOpencodeOptions {
@@ -7,6 +7,11 @@ interface RaindropOpencodeOptions {
     appGit?: AppGitOptions | false;
     /** 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 `client.tool.list` lookup entirely.
+     */
+    tools?: PromptToolsOverride;
 }
 /**
  * The Raindrop control handle exposed alongside the OpenCode hooks.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as IdentifyInput, 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, 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';
 import { Hooks, PluginInput } from '@opencode-ai/plugin';
 
 interface RaindropOpencodeOptions {
@@ -7,6 +7,11 @@ interface RaindropOpencodeOptions {
     appGit?: AppGitOptions | false;
     /** 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 `client.tool.list` lookup entirely.
+     */
+    tools?: PromptToolsOverride;
 }
 /**
  * The Raindrop control handle exposed alongside the OpenCode hooks.

package/dist/index.js

@@ -9,13 +9,15 @@ import {
   buildLlmGenAiAttributes,
   capText,
   createAppGitContext,
+  createToolCatalog,
   generateId,
   loadConfig,
   normalizeSelfDiagnosticsConfig,
   nowUnixNanoString,
+  promptToolsAttributes,
   resolveLocalDebuggerBaseUrl,
   trackSelfDiagnosticsSignal
-} from "./chunk-FCORH4YS.js";
+} from "./chunk-ZG47FVK7.js";
 
 // src/index.ts
 import { tool } from "@opencode-ai/plugin";
@@ -194,7 +196,7 @@ function getHostname() {
     return h;
   }
 }
-function createTracing(config, worktree, directory, eventShipper, traceShipper) {
+function createTracing(config, worktree, directory, eventShipper, traceShipper, toolCatalog) {
   function log(msg, data) {
     if (!config.debug) return;
     const prefix = `[raindrop-ai/opencode-plugin] [info] ${msg}`;
@@ -221,6 +223,14 @@ function createTracing(config, worktree, directory, eventShipper, traceShipper)
     log
   });
   const hooks = {
+    // Fires before each model call with the model already resolved: start the
+    // catalog lookup now so the span attributes rarely wait on it later.
+    "chat.params": async (input) => {
+      void (toolCatalog == null ? void 0 : toolCatalog.resolve(input.sessionID, {
+        provider: input.model.providerID,
+        model: input.model.id
+      }));
+    },
     // ------------------------------------------------------------------
     // event — session lifecycle + streaming parts
     // ------------------------------------------------------------------
@@ -345,6 +355,9 @@ function createTracing(config, worktree, directory, eventShipper, traceShipper)
               "message.updated: providerID and modelID are required non-empty strings"
             );
           const modelName = `${providerID}/${modelID}`;
+          const promptTools = promptToolsAttributes(
+            await (toolCatalog == null ? void 0 : toolCatalog.resolve(String(msgSessionID), { provider: providerID, model: modelID }))
+          );
           const finishReason = info2["finish"];
           const outputText = state.outputParts.get(messageId);
           const reasoningText = state.reasoningParts.get(messageId);
@@ -370,7 +383,8 @@ type: ${name != null ? name : "UnknownError"}`;
             const llmAttrs = [
               attrString("ai.operationId", "generateText"),
               attrString("ai.response.text", responseText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (state.currentSystemPrompt) {
               llmAttrs.push(
@@ -406,7 +420,8 @@ type: ${name != null ? name : "UnknownError"}`;
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
               attrString("ai.response.text", turnOutputText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (state.currentSystemPrompt) {
               llmAttrs.push(
@@ -451,7 +466,8 @@ type: ${name != null ? name : "UnknownError"}`;
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
               attrString("ai.response.text", turnOutputText),
-              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj }),
+              ...promptTools
             ];
             if (isCompaction) {
               rootAttrs.push(attrString("is_compaction", "true"));
@@ -517,6 +533,7 @@ type: ${name != null ? name : "UnknownError"}`;
           if (state.parentId) {
             cleanupSessionParentMap(String(sessionID));
             sessions.delete(String(sessionID));
+            toolCatalog == null ? void 0 : toolCatalog.forget(String(sessionID));
           } else {
           }
         } else if (event.type === "session.deleted") {
@@ -533,6 +550,7 @@ type: ${name != null ? name : "UnknownError"}`;
           cleanupSessionParentMap(String(sessionID));
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(sessionID));
+          toolCatalog == null ? void 0 : toolCatalog.forget(String(sessionID));
         } else if (event.type === "session.error") {
           const errorSessionID = (_h = props["sessionID"]) != null ? _h : sessionID;
           if (errorSessionID === void 0 || errorSessionID === "")
@@ -558,6 +576,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
           cleanupSessionParentMap(String(errorSessionID));
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(errorSessionID));
+          toolCatalog == null ? void 0 : toolCatalog.forget(String(errorSessionID));
         }
       } catch (err) {
         rateLimitedErrorLog(
@@ -869,7 +888,7 @@ function createRaindropHandle(eventShipper, traceShipper, appGitContext, current
   };
 }
 async function plugin(input, opts = {}) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const config = loadConfig(input.directory);
   function appLog(level, message) {
     console.log(`[raindrop-ai/opencode-plugin] [${level}] ${message}`);
@@ -913,16 +932,22 @@ async function plugin(input, opts = {}) {
     appGitContext
   });
   const worktree = (_c = input.worktree) != null ? _c : input.directory;
+  const toolCatalog = createToolCatalog({
+    override: (_d = opts.tools) != null ? _d : config.tools,
+    fetch: (query) => input.client.tool.list({ query }),
+    debug: config.debug
+  });
   const tracing = createTracing(
     config,
     worktree,
     input.directory,
     eventShipper,
-    traceShipper
+    traceShipper,
+    toolCatalog
   );
   const hooks = tracing.hooks;
   const selfDiagnostics = normalizeSelfDiagnosticsConfig(
-    (_d = opts.selfDiagnostics) != null ? _d : config.selfDiagnostics
+    (_e = opts.selfDiagnostics) != null ? _e : config.selfDiagnostics
   );
   if (selfDiagnostics && !config.writeKey.trim()) {
     appLog(

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

@@ -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 };