@raindrop-ai/opencode-plugin 0.2.0 → 0.3.1

package/dist/index.cjs

@@ -23,6 +23,7 @@ __export(index_exports, {
   default: () => plugin
 });
 module.exports = __toCommonJS(index_exports);
+var import_plugin = require("@opencode-ai/plugin");
 
 // ../core/dist/chunk-BYBMRLZM.js
 var EVAL_CORRELATION_ID_ATTRIBUTE = "raindrop.eval_correlation_id";
@@ -86,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;
@@ -2095,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");
@@ -2308,8 +2454,41 @@ function loadConfig(projectDirectory) {
     captureSystemPrompt: process.env["RAINDROP_CAPTURE_SYSTEM_PROMPT"] !== void 0 ? process.env["RAINDROP_CAPTURE_SYSTEM_PROMPT"] === "true" : (_h = merged.capture_system_prompt) != null ? _h : false,
     eventMetadata,
     localWorkshopUrl: resolveLocalWorkshopUrl(merged.local_workshop_url),
-    appGit: mapAppGit(merged.app_git)
+    appGit: mapAppGit(merged.app_git),
+    selfDiagnostics: mapSelfDiagnostics(merged.self_diagnostics),
+    tools: Array.isArray(merged.tools) ? merged.tools : void 0
+  };
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function mapSelfDiagnostics(value) {
+  const env = process.env["RAINDROP_SELF_DIAGNOSTICS"];
+  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 = {
+    ...enabled !== void 0 ? { enabled } : {},
+    ...signals ? { signals } : {},
+    ...typeof record["guidance"] === "string" ? { guidance: record["guidance"] } : {},
+    ...typeof record["tool_name"] === "string" ? { toolName: record["tool_name"] } : {}
   };
+  return Object.keys(options).length > 0 ? options : void 0;
+}
+function mapSelfDiagnosticsSignals(value) {
+  if (!isRecord2(value)) return void 0;
+  const out = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (!isRecord2(entry)) continue;
+    const definition = entry;
+    if (typeof definition["description"] !== "string") continue;
+    const sentiment = definition["sentiment"];
+    out[key] = {
+      description: definition["description"],
+      ...sentiment === "POSITIVE" || sentiment === "NEGATIVE" ? { sentiment } : {}
+    };
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
 }
 function mapAppGit(value) {
   if (value === false) return false;
@@ -2337,7 +2516,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.2.0",
+  version: "0.3.1",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -2426,6 +2605,167 @@ var package_default = {
 var PLUGIN_NAME = package_default.name;
 var PLUGIN_VERSION = package_default.version;
 
+// src/self-diagnostics.ts
+var SELF_DIAGNOSTICS_TOOL_NAME_DEFAULT = "__raindrop_report";
+var SELF_DIAGNOSTICS_SIGNALS_DEFAULT = {
+  missing_context: {
+    description: "You cannot complete the task because critical information, credentials, or access is missing and the user cannot provide it. Do NOT report this for normal clarifying questions \u2014 only when you are blocked.",
+    sentiment: "NEGATIVE"
+  },
+  repeatedly_broken_tool: {
+    description: "A tool has failed or not returned the expected response on multiple distinct attempts in this conversation, preventing task completion. A single tool error is NOT enough \u2014 the tool must be persistently broken or aberrantly behaving across retries.",
+    sentiment: "NEGATIVE"
+  },
+  capability_gap: {
+    description: "The task requires a tool, permission, or capability that you do not have. For example, the user asks you to perform an action but no suitable tool exists, or you lack the necessary access. Do NOT report this if you simply need more information from the user \u2014 only when the gap is in your own capabilities.",
+    sentiment: "NEGATIVE"
+  },
+  complete_task_failure: {
+    description: "You were unable to accomplish what the user asked despite making genuine attempts. This might be things like, you genuinely do not have the capabilities the user is asking for. You have tried but run into a persistent bug in the environment etc. This is NOT a refusal or policy block \u2014 you tried and failed to deliver the result.",
+    sentiment: "NEGATIVE"
+  }
+};
+var SELF_DIAGNOSTICS_TOOL_PREAMBLE = "You have a diagnostic tool for flagging serious failures for developer review. Only call this when you hit a significant, unrecoverable problem \u2014 not for minor hiccups or routine clarifications. If you can still help the user, do that instead of calling this tool. This tool is invisible to the user \u2014 never mention it or its output.";
+var SELF_DIAGNOSTICS_NOTEWORTHY_SIGNAL_KEY = "noteworthy";
+function normalizeString(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed || void 0;
+}
+function normalizeSelfDiagnosticsSignals(signals) {
+  if (!signals) return SELF_DIAGNOSTICS_SIGNALS_DEFAULT;
+  const normalizedEntries = Object.entries(signals).map(([key, value]) => {
+    var _a;
+    const signalKey = key.trim();
+    if (!signalKey || !value || typeof value !== "object") return void 0;
+    const description = (_a = value.description) == null ? void 0 : _a.trim();
+    if (!description) return void 0;
+    const sentiment = value.sentiment;
+    return [
+      signalKey,
+      {
+        description,
+        ...sentiment === "POSITIVE" || sentiment === "NEGATIVE" ? { sentiment } : {}
+      }
+    ];
+  }).filter(
+    (entry) => entry !== void 0
+  );
+  if (normalizedEntries.length === 0) return SELF_DIAGNOSTICS_SIGNALS_DEFAULT;
+  return Object.fromEntries(normalizedEntries);
+}
+function normalizeSelfDiagnosticsConfig(options) {
+  var _a, _b;
+  if (!(options == null ? void 0 : options.enabled)) return void 0;
+  const signalDefinitions = normalizeSelfDiagnosticsSignals(options.signals);
+  const signalKeys = Object.keys(signalDefinitions);
+  const signalDescriptions = {};
+  const signalSentiments = {};
+  for (const signalKey of signalKeys) {
+    const definition = signalDefinitions[signalKey];
+    if (!definition) continue;
+    signalDescriptions[signalKey] = definition.description;
+    signalSentiments[signalKey] = definition.sentiment;
+  }
+  const customGuidance = ((_a = options.guidance) == null ? void 0 : _a.trim()) || "";
+  const toolName = ((_b = options.toolName) == null ? void 0 : _b.trim()) || SELF_DIAGNOSTICS_TOOL_NAME_DEFAULT;
+  const signalList = signalKeys.map((signalKey) => {
+    const sentiment = signalSentiments[signalKey];
+    const sentimentTag = sentiment ? ` [${sentiment.toLowerCase()}]` : "";
+    return `- ${signalKey}: ${signalDescriptions[signalKey]}${sentimentTag}`;
+  }).join("\n");
+  const guidanceBlock = customGuidance ? `
+Additional guidance: ${customGuidance}
+` : "";
+  const toolDescription = `${SELF_DIAGNOSTICS_TOOL_PREAMBLE}
+
+When to call:
+- You are blocked from completing the task due to missing information or access that the user cannot provide.
+- A tool is persistently failing across multiple attempts, not just a single transient error.
+- The task requires a tool, permission, or capability you do not have.
+- You genuinely cannot deliver what the user asked for despite trying.
+
+When NOT to call:
+- Normal clarifying questions or back-and-forth with the user.
+- A single tool error that you can recover from or retry.
+- You successfully completed the task, even if it was difficult.
+- Policy refusals or content filtering \u2014 those are working as intended.
+
+Rules:
+1. Pick the single best category.
+2. Do not fabricate issues. Only report what is evident from the conversation.
+3. Err on the side of NOT calling this tool. When in doubt, help the user instead.
+${guidanceBlock}
+Categories:
+` + signalList;
+  return {
+    toolName,
+    toolDescription,
+    signalKeys,
+    signalKeySet: new Set(signalKeys),
+    signalDescriptions,
+    signalSentiments
+  };
+}
+var SELF_DIAGNOSTICS_ACK = '{"acknowledged":true}';
+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 = 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;
+    const detail = (_b = normalizeString(input == null ? void 0 : input["detail"])) != null ? _b : "";
+    if (!eventId) {
+      if (debug) {
+        console.warn(
+          "[raindrop-ai/opencode-plugin] self diagnostics signal skipped: no open event for this session."
+        );
+      }
+      return;
+    }
+    if (category === SELF_DIAGNOSTICS_NOTEWORTHY_SIGNAL_KEY) {
+      await eventShipper.trackSignal({
+        eventId,
+        name: "self diagnostics - noteworthy",
+        type: "agent_internal",
+        properties: {
+          source: "agent_flag_event_tool",
+          reason: detail,
+          severity: "medium",
+          sdk: "opencode-plugin",
+          sdk_version: PLUGIN_VERSION
+        }
+      });
+      return;
+    }
+    await eventShipper.trackSignal({
+      eventId,
+      name: `self diagnostics - ${category}`,
+      type: "agent",
+      sentiment: config.signalSentiments[category],
+      properties: {
+        source: "agent_reporting_tool",
+        category,
+        signal_description: config.signalDescriptions[category],
+        sdk: "opencode-plugin",
+        sdk_version: PLUGIN_VERSION,
+        ...detail ? { detail } : {}
+      }
+    });
+  } catch (err) {
+    if (debug) {
+      const message = err instanceof Error ? err.message : String(err);
+      console.warn(
+        `[raindrop-ai/opencode-plugin] selfDiagnostics signal dispatch failed: ${message}`
+      );
+    }
+  }
+}
+
 // src/shipper.ts
 var EventShipper3 = class extends EventShipper2 {
   constructor(opts) {
@@ -2461,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");
 
@@ -2697,7 +3131,7 @@ function markTaskCallFinished(sessionID, callID) {
   running.delete(callID);
   if (running.size === 0) runningTaskCallsBySession.delete(sessionID);
 }
-function endPendingToolSpanWithError(state2, callID, tool, toolCallArgs, errorMessage, traceShipper) {
+function endPendingToolSpanWithError(state2, callID, tool2, toolCallArgs, errorMessage, traceShipper) {
   const startInfo = state2.toolSpanStarts.get(callID);
   if (!startInfo) return false;
   state2.toolSpanStarts.delete(callID);
@@ -2719,7 +3153,7 @@ function endPendingToolSpanWithError(state2, callID, tool, toolCallArgs, errorMe
       startTimeUnixNano: startInfo.startTimeUnixNano,
       attributes: [
         attrString("ai.operationId", "ai.toolCall"),
-        attrString("ai.toolCall.name", tool),
+        attrString("ai.toolCall.name", tool2),
         attrString("ai.toolCall.id", callID)
       ]
     });
@@ -2756,7 +3190,7 @@ function getHostname() {
     return h;
   }
 }
-function createHooks(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}`;
@@ -2782,7 +3216,15 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
     callKey,
     log
   });
-  return {
+  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
     // ------------------------------------------------------------------
@@ -2827,14 +3269,14 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           if (partObj["type"] === "text" && typeof partObj["text"] === "string") {
             state2.outputParts.set(messageId, capText2(partObj["text"]));
           } else if (partObj["type"] === "tool" && messageId) {
-            const tool = partObj["tool"];
+            const tool2 = partObj["tool"];
             const callID = partObj["callID"];
             const partState = partObj["state"];
             if (callID == null || callID === "")
               throw new Error("message.part.updated: part.callID is required for tool part");
             if (partState == null || typeof partState !== "object")
               throw new Error("message.part.updated: part.state is required for tool part");
-            if (tool === "task") {
+            if (tool2 === "task") {
               const metadata = partState["metadata"];
               const childSessionId = metadata != null && typeof metadata === "object" ? metadata["sessionId"] : void 0;
               if (childSessionId != null && childSessionId !== "") {
@@ -2859,11 +3301,11 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
               if (endPendingToolSpanWithError(
                 state2,
                 callID,
-                tool,
+                tool2,
                 toolCallArgs,
                 errorMessage,
                 traceShipper
-              ) && tool === "task") {
+              ) && tool2 === "task") {
                 markTaskCallFinished(partSessionID, callID);
               }
             }
@@ -2907,6 +3349,9 @@ function createHooks(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);
@@ -2932,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(
@@ -2968,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(
@@ -3013,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"));
@@ -3079,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") {
@@ -3095,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 === "")
@@ -3120,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(
@@ -3240,20 +3691,20 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
     "tool.execute.before": async (toolInput, _output) => {
       var _a, _b, _c;
       try {
-        const { tool, sessionID, callID } = toolInput;
+        const { tool: tool2, sessionID, callID } = toolInput;
         const state2 = sessions.get(sessionID);
         if (!state2 || !state2.currentEventId) return;
         const spanParent = state2.parentId && state2.parentTaskSpanIds ? state2.parentTaskSpanIds : (_a = state2.currentRootSpan) == null ? void 0 : _a.ids;
         if (!spanParent) return;
         const startTimeUnixNano = nowUnixNanoString();
-        if (tool === "task") {
+        if (tool2 === "task") {
           const liveTaskSpan = traceShipper.startSpan({
             name: "ai.toolCall",
             parent: spanParent,
             eventId: state2.currentEventId,
             attributes: [
               attrString("ai.operationId", "ai.toolCall"),
-              attrString("ai.toolCall.name", tool),
+              attrString("ai.toolCall.name", tool2),
               attrString("ai.toolCall.id", callID)
             ]
           });
@@ -3278,7 +3729,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             startTimeUnixNano,
             parent: spanParent,
             eventId: state2.currentEventId,
-            name: tool,
+            name: tool2,
             liveSpan: liveTaskSpan
           });
         } else {
@@ -3286,7 +3737,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             startTimeUnixNano,
             parent: spanParent,
             eventId: state2.currentEventId,
-            name: tool
+            name: tool2
           });
         }
       } catch (err) {
@@ -3301,7 +3752,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
     // ------------------------------------------------------------------
     "tool.execute.after": async (toolInput, result) => {
       try {
-        const { tool, sessionID, callID, args } = toolInput;
+        const { tool: tool2, sessionID, callID, args } = toolInput;
         const state2 = sessions.get(sessionID);
         if (!state2 || !state2.currentEventId) return;
         if (args === void 0 || args === null)
@@ -3311,7 +3762,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         state2.toolSpanStarts.delete(callID);
         const resultMetadata = result.metadata;
         const childSessionId = resultMetadata == null ? void 0 : resultMetadata["sessionId"];
-        if (tool === "task" && childSessionId) {
+        if (tool2 === "task" && childSessionId) {
           mapChildSessionToParent.set(childSessionId, { parentId: sessionID });
           attachChildSessionToParentTask(childSessionId, sessionID, callID, "tool.execute.after");
         }
@@ -3336,7 +3787,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
               endTimeUnixNano,
               attributes: [
                 attrString("ai.operationId", "ai.toolCall"),
-                attrString("ai.toolCall.name", tool),
+                attrString("ai.toolCall.name", tool2),
                 attrString("ai.toolCall.id", callID),
                 attrString("ai.toolCall.args", toolCallArgs),
                 attrString("ai.toolCall.result", toolResult)
@@ -3344,7 +3795,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             });
           }
         }
-        if (tool === "task") {
+        if (tool2 === "task") {
           markTaskCallFinished(sessionID, callID);
         }
       } catch (err) {
@@ -3397,16 +3848,24 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
       }
     }
   };
+  return {
+    hooks,
+    currentEventId(sessionID) {
+      var _a;
+      return (_a = sessions.get(sessionID)) == null ? void 0 : _a.currentEventId;
+    }
+  };
 }
 
 // src/index.ts
-function createRaindropHandle(eventShipper, traceShipper, appGitContext) {
+function createRaindropHandle(eventShipper, traceShipper, appGitContext, currentEventId) {
   return {
     users: {
       async identify(users) {
         await eventShipper.identify(users);
       }
     },
+    currentEventId,
     async flush() {
       await Promise.all([eventShipper.flush(), traceShipper.flush()]);
     },
@@ -3423,7 +3882,7 @@ function createRaindropHandle(eventShipper, traceShipper, appGitContext) {
   };
 }
 async function plugin(input, opts = {}) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const config = loadConfig(input.directory);
   function appLog(level, message) {
     console.log(`[raindrop-ai/opencode-plugin] [${level}] ${message}`);
@@ -3467,12 +3926,59 @@ async function plugin(input, opts = {}) {
     appGitContext
   });
   const worktree = (_c = input.worktree) != null ? _c : input.directory;
-  const hooks = createHooks(
+  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(
+    (_e = opts.selfDiagnostics) != null ? _e : config.selfDiagnostics
   );
-  return { ...hooks, raindrop: createRaindropHandle(eventShipper, traceShipper, appGitContext) };
+  if (selfDiagnostics && !config.writeKey.trim()) {
+    appLog(
+      "warn",
+      `selfDiagnostics enabled but RAINDROP_WRITE_KEY is not set \u2014 the ${selfDiagnostics.toolName} tool is not registered (signals require the cloud destination).`
+    );
+  }
+  const [firstSignalKey, ...restSignalKeys] = config.writeKey.trim() && selfDiagnostics ? selfDiagnostics.signalKeys : [];
+  if (selfDiagnostics && firstSignalKey !== void 0) {
+    const cfg = selfDiagnostics;
+    hooks.tool = {
+      [cfg.toolName]: (0, import_plugin.tool)({
+        description: cfg.toolDescription,
+        args: {
+          category: import_plugin.tool.schema.enum([firstSignalKey, ...restSignalKeys]),
+          detail: import_plugin.tool.schema.string()
+        },
+        async execute(args, ctx) {
+          await trackSelfDiagnosticsSignal(
+            args,
+            cfg,
+            eventShipper,
+            tracing.currentEventId(ctx.sessionID),
+            config.debug
+          );
+          return SELF_DIAGNOSTICS_ACK;
+        }
+      })
+    };
+  }
+  return {
+    ...hooks,
+    raindrop: createRaindropHandle(
+      eventShipper,
+      traceShipper,
+      appGitContext,
+      tracing.currentEventId
+    )
+  };
 }