@raindrop-ai/opencode-plugin 0.0.19 → 0.1.1

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-267IXHO5.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -417,19 +417,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const out = { ...target, ...source };
   if (target.properties || source.properties) {
     out.properties = { ...(_a = target.properties) != null ? _a : {}, ...(_b = source.properties) != null ? _b : {} };
   }
+  if (target.usage || source.usage) {
+    out.usage = { ...(_c = target.usage) != null ? _c : {} };
+    if (((_d = source.usage) == null ? void 0 : _d.promptTokens) !== void 0) {
+      out.usage.promptTokens = source.usage.promptTokens;
+    }
+    if (((_e = source.usage) == null ? void 0 : _e.completionTokens) !== void 0) {
+      out.usage.completionTokens = source.usage.completionTokens;
+    }
+  }
+  if (source.error === void 0) {
+    out.error = target.error;
+  }
   if (target.featureFlags || source.featureFlags) {
-    out.featureFlags = { ...(_c = target.featureFlags) != null ? _c : {}, ...(_d = source.featureFlags) != null ? _d : {} };
+    out.featureFlags = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
   }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_e = target.attachments) != null ? _e : [], ...(_f = source.attachments) != null ? _f : []];
+    out.attachments = [...(_h = target.attachments) != null ? _h : [], ...(_i = source.attachments) != null ? _i : []];
   }
   return out;
 }
+function isErrorLike(value) {
+  return value !== null && typeof value === "object";
+}
+function eventTelemetryProperties(patch) {
+  var _a, _b;
+  const properties = {};
+  if (((_a = patch.usage) == null ? void 0 : _a.promptTokens) !== void 0 && Number.isFinite(patch.usage.promptTokens)) {
+    properties["ai.usage.prompt_tokens"] = patch.usage.promptTokens;
+  }
+  if (((_b = patch.usage) == null ? void 0 : _b.completionTokens) !== void 0 && Number.isFinite(patch.usage.completionTokens)) {
+    properties["ai.usage.completion_tokens"] = patch.usage.completionTokens;
+  }
+  if (patch.error !== void 0 && patch.error !== null) {
+    const constructorName = patch.error instanceof Error && patch.error.constructor !== Error ? patch.error.constructor.name : void 0;
+    const errorType = patch.error instanceof Error ? patch.error.name && patch.error.name !== "Error" ? patch.error.name : constructorName || patch.error.name || "Error" : isErrorLike(patch.error) && typeof patch.error.name === "string" && patch.error.name.length > 0 ? patch.error.name : "Error";
+    const errorMessage = patch.error instanceof Error ? patch.error.message : isErrorLike(patch.error) && typeof patch.error.message === "string" ? patch.error.message : String(patch.error);
+    properties["error.type"] = errorType;
+    properties["error.message"] = errorMessage;
+  }
+  return properties;
+}
 var EventShipper = class {
   constructor(opts) {
     this.buffers = /* @__PURE__ */ new Map();
@@ -678,6 +711,11 @@ var EventShipper = class {
       return;
     }
     const { wizardSession, ...restProperties } = (_e = accumulated.properties) != null ? _e : {};
+    let telemetryProperties = {};
+    try {
+      telemetryProperties = eventTelemetryProperties(accumulated);
+    } catch (e) {
+    }
     const convoId = (_f = accumulated.convoId) != null ? _f : sticky.convoId;
     const isPending = (_h = (_g = accumulated.isPending) != null ? _g : sticky.isPending) != null ? _h : true;
     const payload = {
@@ -687,12 +725,13 @@ var EventShipper = class {
       timestamp: (_i = accumulated.timestamp) != null ? _i : (/* @__PURE__ */ new Date()).toISOString(),
       ai_data: {
         input: accumulated.input,
-        output: accumulated.output,
+        output: accumulated.error !== void 0 && accumulated.error !== null ? void 0 : accumulated.output,
         model: accumulated.model,
         convo_id: convoId
       },
       properties: {
         ...restProperties,
+        ...telemetryProperties,
         ...wizardSession ? { "raindrop.wizardSession": wizardSession } : {},
         $context: this.context
       },
@@ -850,6 +889,13 @@ function redactJsonAttributeValue(key, value) {
   if (scrubbedJson === json) return void 0;
   return { stringValue: scrubbedJson };
 }
+function identityAttrs(args) {
+  return [
+    attrString("ai.telemetry.metadata.raindrop.ai.userId", args.userId),
+    attrString("ai.telemetry.metadata.raindrop.convoId", args.convoId),
+    attrString("ai.telemetry.metadata.raindrop.eventName", args.eventName)
+  ];
+}
 function applyOtelSpanAttributeLimit(limit) {
   var _a, _b;
   try {
@@ -974,6 +1020,7 @@ var TraceShipper = class {
     const started = (_a = args.startTimeUnixNano) != null ? _a : nowUnixNanoString();
     const attrs = [
       attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args),
       attrString("ai.operationId", args.operationId)
     ];
     if ((_b = args.attributes) == null ? void 0 : _b.length) attrs.push(...args.attributes);
@@ -1029,7 +1076,8 @@ var TraceShipper = class {
     var _a;
     const ids = createSpanIds(args.parent);
     const attrs = [
-      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId)
+      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args)
     ];
     if ((_a = args.attributes) == null ? void 0 : _a.length) attrs.push(...args.attributes);
     const otlp = buildOtlpSpan({
@@ -1248,7 +1296,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.19",
+  version: "0.1.1",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1528,6 +1576,8 @@ function createSessionState(sessionId) {
   return {
     sessionId,
     currentInput: "",
+    turnOutputParts: [],
+    turnOutputTokens: 0,
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
     toolSpanStarts: /* @__PURE__ */ new Map(),
@@ -1633,7 +1683,7 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
     // event — session lifecycle + streaming parts
     // ------------------------------------------------------------------
     event: async ({ event }) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       try {
         const props = event.properties;
         const info = props["info"];
@@ -1758,6 +1808,10 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const outputText = state.outputParts.get(messageId);
           const reasoningText = state.reasoningParts.get(messageId);
           const isToolCallsCompletion = finishReason === "tool-calls";
+          if (outputText !== void 0 && outputText.trim().length > 0) {
+            state.turnOutputParts.push(outputText);
+          }
+          state.turnOutputTokens += outputTokens;
           const hasIntermediateReasoning = reasoningText !== void 0 && reasoningText.trim().length > 0;
           if (outputText === void 0 && !(isToolCallsCompletion && hasIntermediateReasoning))
             return;
@@ -1812,6 +1866,7 @@ type: ${name != null ? name : "UnknownError"}`;
             return;
           }
           if (outputText === void 0) return;
+          const turnOutputText = capText2(state.turnOutputParts.join("\n\n"));
           const rootSpan = state.currentRootSpan;
           const isCompaction = state.isCompacting === true;
           if (state.parentId) {
@@ -1823,7 +1878,7 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
+              attrString("ai.response.text", turnOutputText),
               attrString("gen_ai.system", providerID),
               attrString("gen_ai.request.model", modelID),
               attrString("gen_ai.response.model", modelID),
@@ -1875,7 +1930,7 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
+              attrString("ai.response.text", turnOutputText),
               attrString("gen_ai.system", providerID),
               attrString("gen_ai.request.model", modelID),
               attrString("gen_ai.response.model", modelID),
@@ -1904,8 +1959,8 @@ type: ${name != null ? name : "UnknownError"}`;
             }
           }
           state.currentRootSpan = void 0;
-          const hasAssistantResponse = outputText.trim().length > 0;
-          if (!hasAssistantResponse) {
+          const hasAssistantResponse = turnOutputText.trim().length > 0;
+          if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
             return;
@@ -1914,7 +1969,15 @@ type: ${name != null ? name : "UnknownError"}`;
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
               model: modelID,
-              output: outputText,
+              output: msgError ? void 0 : turnOutputText,
+              usage: {
+                promptTokens: inputTokens,
+                completionTokens: state.turnOutputTokens
+              },
+              error: msgError ? {
+                name: msgError.name,
+                message: (_g = (_f = (_e = msgError.data) == null ? void 0 : _e.message) != null ? _f : msgError.name) != null ? _g : "OpenCode request failed"
+              } : void 0,
               properties: {
                 plugin_version: PLUGIN_VERSION,
                 message_id: messageId,
@@ -1958,7 +2021,7 @@ type: ${name != null ? name : "UnknownError"}`;
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(sessionID));
         } else if (event.type === "session.error") {
-          const errorSessionID = (_e = props["sessionID"]) != null ? _e : sessionID;
+          const errorSessionID = (_h = props["sessionID"]) != null ? _h : sessionID;
           if (errorSessionID === void 0 || errorSessionID === "")
             throw new Error("session.error: missing sessionID");
           const state = sessions.get(String(errorSessionID));
@@ -1966,7 +2029,7 @@ type: ${name != null ? name : "UnknownError"}`;
           const errorObj = props["error"];
           if (errorObj == null) throw new Error("session.error: missing error object");
           const errorName = errorObj.name;
-          const errorMessage = (_g = (_f = errorObj.data) == null ? void 0 : _f.message) != null ? _g : errorObj.name;
+          const errorMessage = (_j = (_i = errorObj.data) == null ? void 0 : _i.message) != null ? _j : errorObj.name;
           if (errorName == null && errorMessage == null)
             throw new Error("session.error: error object must have name or data.message");
           const errorStr = `${errorMessage != null ? errorMessage : errorName}
@@ -2043,6 +2106,8 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         };
         const userText = capText2(textParts.join("\n"));
         state.currentInput = userText;
+        state.turnOutputParts = [];
+        state.turnOutputTokens = 0;
         if (state.parentId) {
           if (!state.parentTaskSpanIds || !state.parentEventContext) {
             return;
@@ -2260,6 +2325,21 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
 }
 
 // src/index.ts
+function createRaindropHandle(eventShipper, traceShipper) {
+  return {
+    users: {
+      async identify(users) {
+        await eventShipper.identify(users);
+      }
+    },
+    async flush() {
+      await Promise.all([eventShipper.flush(), traceShipper.flush()]);
+    },
+    async shutdown() {
+      await Promise.all([eventShipper.shutdown(), traceShipper.shutdown()]);
+    }
+  };
+}
 async function plugin(input) {
   var _a;
   const config = loadConfig(input.directory);
@@ -2305,5 +2385,5 @@ async function plugin(input) {
     eventShipper,
     traceShipper
   );
-  return hooks;
+  return { ...hooks, raindrop: createRaindropHandle(eventShipper, traceShipper) };
 }

package/dist/index.d.cts

@@ -1,5 +1,107 @@
-import { PluginInput, Hooks } from '@opencode-ai/plugin';
+import { Hooks, PluginInput } from '@opencode-ai/plugin';
 
+type IdentifyInput = {
+    userId: string;
+    traits?: Record<string, unknown>;
+};
+
+/**
+ * Run telemetry egress with OpenTelemetry tracing suppressed.
+ *
+ * Why this exists
+ * ---------------
+ * Raindrop integrations ship spans/events over HTTP with the global `fetch`
+ * (see {@link ../http.ts `postJson`}). When the host app also runs an OTel
+ * fetch/undici instrumentation — e.g. `@vercel/otel`'s `registerOTel`, which
+ * every Eve agent installs — that instrumentation wraps *our own* telemetry
+ * POSTs in a `fetch POST <endpoint>` span. Those spans are then handed to the
+ * very exporter that issued the request, so they get shipped right back to
+ * Raindrop and Workshop as standalone "runs" (and, because each export issues
+ * another fetch, they feed back on themselves). The result is a run list
+ * flooded with `fetch POST .../v1/traces`, `.../events/track_partial` and
+ * `.../live` entries that drown out the real agent turns — especially with
+ * sub-agents, where every sandbox runs its own instrumentation.
+ *
+ * The OTel-blessed fix is to mark the active context as "tracing suppressed"
+ * around the request; instrumentations check `isTracingSuppressed` and return
+ * a no-op span instead of recording one. We do this through a hook stashed on
+ * `globalThis` by the Node entrypoint ({@link ../index.node.ts}) so that:
+ *   - `@opentelemetry/api` / `@opentelemetry/core` stay *optional* — core never
+ *     hard-depends on them, and the hook is simply absent when they (and thus
+ *     any instrumentation to suppress) are not installed; and
+ *   - the browser bundle never pulls in `node:module`, mirroring how core
+ *     injects `AsyncLocalStorage` via `RAINDROP_ASYNC_LOCAL_STORAGE`.
+ *
+ * When no hook is present the callback runs unchanged, so suppression is a
+ * best-effort no-op rather than a hard requirement.
+ */
+/** Hook signature: run `fn` with OTel tracing suppressed, returning its value. */
+type SuppressTracingHook = <T>(fn: () => T) => T;
+declare global {
+    var RAINDROP_SUPPRESS_TRACING: SuppressTracingHook | undefined;
+}
+
+type ParentSpanContext = {
+    traceIdB64: string;
+    spanIdB64: string;
+    eventId: string;
+};
+interface ContextSpan {
+    readonly traceIdB64: string;
+    readonly spanIdB64: string;
+    readonly eventId: string;
+    log?(data: Record<string, unknown>): void;
+}
+interface AsyncLocalStorageLike<T> {
+    getStore(): T | undefined;
+    run<R>(store: T, callback: () => R): R;
+    enterWith?(store: T): void;
+}
+declare abstract class ContextManager {
+    abstract getParentSpanIds(): ParentSpanContext | undefined;
+    abstract runInContext<R>(span: ContextSpan, callback: () => R): R;
+    abstract getCurrentSpan(): ContextSpan | undefined;
+    abstract isReady(): boolean;
+}
+declare global {
+    var RAINDROP_CONTEXT_MANAGER: (new () => ContextManager) | undefined;
+    var RAINDROP_ASYNC_LOCAL_STORAGE: (new <T>() => AsyncLocalStorageLike<T>) | undefined;
+}
+
+/**
+ * The Raindrop control handle exposed alongside the OpenCode hooks.
+ *
+ * The plugin's public surface is the framework `Hooks` object, which OpenCode
+ * consumes and whose keyspace it owns. Rather than pollute that keyspace with a
+ * top-level `users` (as the client-factory wrappers do), the identify surface
+ * lives under a namespaced `raindrop` handle — mirroring `@raindrop-ai/eve`'s
+ * `raindrop` handle precedent — so application/tool code can attach user traits
+ * without waiting for a session hook to fire.
+ */
+interface RaindropOpencodeHandle {
+    users: {
+        /**
+         * Attach traits to one or more users (posts to `users/identify`). Buffered
+         * in the shared EventShipper and delivered on the next {@link flush} / span
+         * flush, so pair a bare identify with `flush()` when there is no active
+         * OpenCode session driving delivery.
+         */
+        identify(users: IdentifyInput | IdentifyInput[]): Promise<void>;
+    };
+    /** Drain the buffered event + trace shippers. */
+    flush(): Promise<void>;
+    /** Flush and tear down the shippers (also wired into session teardown). */
+    shutdown(): Promise<void>;
+}
+/**
+ * The plugin's return value: the OpenCode {@link Hooks} plus the additive
+ * {@link RaindropOpencodeHandle}. `raindrop` is optional because the plugin
+ * returns bare `{}` (no handle) when tracing is disabled — no write key and no
+ * local Workshop destination.
+ */
+type RaindropOpencodeHooks = Hooks & {
+    raindrop?: RaindropOpencodeHandle;
+};
 /**
  * Raindrop plugin for OpenCode.
  *
@@ -12,6 +114,6 @@ import { PluginInput, Hooks } from '@opencode-ai/plugin';
  *
  * Optional config file: ~/.config/opencode/raindrop.json or .opencode/raindrop.json
  */
-declare function plugin(input: PluginInput): Promise<Hooks>;
+declare function plugin(input: PluginInput): Promise<RaindropOpencodeHooks>;
 
-export { plugin as default };
+export { type IdentifyInput, type RaindropOpencodeHandle, type RaindropOpencodeHooks, plugin as default };

package/dist/index.d.ts

@@ -1,5 +1,107 @@
-import { PluginInput, Hooks } from '@opencode-ai/plugin';
+import { Hooks, PluginInput } from '@opencode-ai/plugin';
 
+type IdentifyInput = {
+    userId: string;
+    traits?: Record<string, unknown>;
+};
+
+/**
+ * Run telemetry egress with OpenTelemetry tracing suppressed.
+ *
+ * Why this exists
+ * ---------------
+ * Raindrop integrations ship spans/events over HTTP with the global `fetch`
+ * (see {@link ../http.ts `postJson`}). When the host app also runs an OTel
+ * fetch/undici instrumentation — e.g. `@vercel/otel`'s `registerOTel`, which
+ * every Eve agent installs — that instrumentation wraps *our own* telemetry
+ * POSTs in a `fetch POST <endpoint>` span. Those spans are then handed to the
+ * very exporter that issued the request, so they get shipped right back to
+ * Raindrop and Workshop as standalone "runs" (and, because each export issues
+ * another fetch, they feed back on themselves). The result is a run list
+ * flooded with `fetch POST .../v1/traces`, `.../events/track_partial` and
+ * `.../live` entries that drown out the real agent turns — especially with
+ * sub-agents, where every sandbox runs its own instrumentation.
+ *
+ * The OTel-blessed fix is to mark the active context as "tracing suppressed"
+ * around the request; instrumentations check `isTracingSuppressed` and return
+ * a no-op span instead of recording one. We do this through a hook stashed on
+ * `globalThis` by the Node entrypoint ({@link ../index.node.ts}) so that:
+ *   - `@opentelemetry/api` / `@opentelemetry/core` stay *optional* — core never
+ *     hard-depends on them, and the hook is simply absent when they (and thus
+ *     any instrumentation to suppress) are not installed; and
+ *   - the browser bundle never pulls in `node:module`, mirroring how core
+ *     injects `AsyncLocalStorage` via `RAINDROP_ASYNC_LOCAL_STORAGE`.
+ *
+ * When no hook is present the callback runs unchanged, so suppression is a
+ * best-effort no-op rather than a hard requirement.
+ */
+/** Hook signature: run `fn` with OTel tracing suppressed, returning its value. */
+type SuppressTracingHook = <T>(fn: () => T) => T;
+declare global {
+    var RAINDROP_SUPPRESS_TRACING: SuppressTracingHook | undefined;
+}
+
+type ParentSpanContext = {
+    traceIdB64: string;
+    spanIdB64: string;
+    eventId: string;
+};
+interface ContextSpan {
+    readonly traceIdB64: string;
+    readonly spanIdB64: string;
+    readonly eventId: string;
+    log?(data: Record<string, unknown>): void;
+}
+interface AsyncLocalStorageLike<T> {
+    getStore(): T | undefined;
+    run<R>(store: T, callback: () => R): R;
+    enterWith?(store: T): void;
+}
+declare abstract class ContextManager {
+    abstract getParentSpanIds(): ParentSpanContext | undefined;
+    abstract runInContext<R>(span: ContextSpan, callback: () => R): R;
+    abstract getCurrentSpan(): ContextSpan | undefined;
+    abstract isReady(): boolean;
+}
+declare global {
+    var RAINDROP_CONTEXT_MANAGER: (new () => ContextManager) | undefined;
+    var RAINDROP_ASYNC_LOCAL_STORAGE: (new <T>() => AsyncLocalStorageLike<T>) | undefined;
+}
+
+/**
+ * The Raindrop control handle exposed alongside the OpenCode hooks.
+ *
+ * The plugin's public surface is the framework `Hooks` object, which OpenCode
+ * consumes and whose keyspace it owns. Rather than pollute that keyspace with a
+ * top-level `users` (as the client-factory wrappers do), the identify surface
+ * lives under a namespaced `raindrop` handle — mirroring `@raindrop-ai/eve`'s
+ * `raindrop` handle precedent — so application/tool code can attach user traits
+ * without waiting for a session hook to fire.
+ */
+interface RaindropOpencodeHandle {
+    users: {
+        /**
+         * Attach traits to one or more users (posts to `users/identify`). Buffered
+         * in the shared EventShipper and delivered on the next {@link flush} / span
+         * flush, so pair a bare identify with `flush()` when there is no active
+         * OpenCode session driving delivery.
+         */
+        identify(users: IdentifyInput | IdentifyInput[]): Promise<void>;
+    };
+    /** Drain the buffered event + trace shippers. */
+    flush(): Promise<void>;
+    /** Flush and tear down the shippers (also wired into session teardown). */
+    shutdown(): Promise<void>;
+}
+/**
+ * The plugin's return value: the OpenCode {@link Hooks} plus the additive
+ * {@link RaindropOpencodeHandle}. `raindrop` is optional because the plugin
+ * returns bare `{}` (no handle) when tracing is disabled — no write key and no
+ * local Workshop destination.
+ */
+type RaindropOpencodeHooks = Hooks & {
+    raindrop?: RaindropOpencodeHandle;
+};
 /**
  * Raindrop plugin for OpenCode.
  *
@@ -12,6 +114,6 @@ import { PluginInput, Hooks } from '@opencode-ai/plugin';
  *
  * Optional config file: ~/.config/opencode/raindrop.json or .opencode/raindrop.json
  */
-declare function plugin(input: PluginInput): Promise<Hooks>;
+declare function plugin(input: PluginInput): Promise<RaindropOpencodeHooks>;
 
-export { plugin as default };
+export { type IdentifyInput, type RaindropOpencodeHandle, type RaindropOpencodeHooks, plugin as default };

package/dist/index.js

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../core/dist/chunk-267IXHO5.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -398,19 +398,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const out = { ...target, ...source };
   if (target.properties || source.properties) {
     out.properties = { ...(_a = target.properties) != null ? _a : {}, ...(_b = source.properties) != null ? _b : {} };
   }
+  if (target.usage || source.usage) {
+    out.usage = { ...(_c = target.usage) != null ? _c : {} };
+    if (((_d = source.usage) == null ? void 0 : _d.promptTokens) !== void 0) {
+      out.usage.promptTokens = source.usage.promptTokens;
+    }
+    if (((_e = source.usage) == null ? void 0 : _e.completionTokens) !== void 0) {
+      out.usage.completionTokens = source.usage.completionTokens;
+    }
+  }
+  if (source.error === void 0) {
+    out.error = target.error;
+  }
   if (target.featureFlags || source.featureFlags) {
-    out.featureFlags = { ...(_c = target.featureFlags) != null ? _c : {}, ...(_d = source.featureFlags) != null ? _d : {} };
+    out.featureFlags = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
   }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_e = target.attachments) != null ? _e : [], ...(_f = source.attachments) != null ? _f : []];
+    out.attachments = [...(_h = target.attachments) != null ? _h : [], ...(_i = source.attachments) != null ? _i : []];
   }
   return out;
 }
+function isErrorLike(value) {
+  return value !== null && typeof value === "object";
+}
+function eventTelemetryProperties(patch) {
+  var _a, _b;
+  const properties = {};
+  if (((_a = patch.usage) == null ? void 0 : _a.promptTokens) !== void 0 && Number.isFinite(patch.usage.promptTokens)) {
+    properties["ai.usage.prompt_tokens"] = patch.usage.promptTokens;
+  }
+  if (((_b = patch.usage) == null ? void 0 : _b.completionTokens) !== void 0 && Number.isFinite(patch.usage.completionTokens)) {
+    properties["ai.usage.completion_tokens"] = patch.usage.completionTokens;
+  }
+  if (patch.error !== void 0 && patch.error !== null) {
+    const constructorName = patch.error instanceof Error && patch.error.constructor !== Error ? patch.error.constructor.name : void 0;
+    const errorType = patch.error instanceof Error ? patch.error.name && patch.error.name !== "Error" ? patch.error.name : constructorName || patch.error.name || "Error" : isErrorLike(patch.error) && typeof patch.error.name === "string" && patch.error.name.length > 0 ? patch.error.name : "Error";
+    const errorMessage = patch.error instanceof Error ? patch.error.message : isErrorLike(patch.error) && typeof patch.error.message === "string" ? patch.error.message : String(patch.error);
+    properties["error.type"] = errorType;
+    properties["error.message"] = errorMessage;
+  }
+  return properties;
+}
 var EventShipper = class {
   constructor(opts) {
     this.buffers = /* @__PURE__ */ new Map();
@@ -659,6 +692,11 @@ var EventShipper = class {
       return;
     }
     const { wizardSession, ...restProperties } = (_e = accumulated.properties) != null ? _e : {};
+    let telemetryProperties = {};
+    try {
+      telemetryProperties = eventTelemetryProperties(accumulated);
+    } catch (e) {
+    }
     const convoId = (_f = accumulated.convoId) != null ? _f : sticky.convoId;
     const isPending = (_h = (_g = accumulated.isPending) != null ? _g : sticky.isPending) != null ? _h : true;
     const payload = {
@@ -668,12 +706,13 @@ var EventShipper = class {
       timestamp: (_i = accumulated.timestamp) != null ? _i : (/* @__PURE__ */ new Date()).toISOString(),
       ai_data: {
         input: accumulated.input,
-        output: accumulated.output,
+        output: accumulated.error !== void 0 && accumulated.error !== null ? void 0 : accumulated.output,
         model: accumulated.model,
         convo_id: convoId
       },
       properties: {
         ...restProperties,
+        ...telemetryProperties,
         ...wizardSession ? { "raindrop.wizardSession": wizardSession } : {},
         $context: this.context
       },
@@ -831,6 +870,13 @@ function redactJsonAttributeValue(key, value) {
   if (scrubbedJson === json) return void 0;
   return { stringValue: scrubbedJson };
 }
+function identityAttrs(args) {
+  return [
+    attrString("ai.telemetry.metadata.raindrop.ai.userId", args.userId),
+    attrString("ai.telemetry.metadata.raindrop.convoId", args.convoId),
+    attrString("ai.telemetry.metadata.raindrop.eventName", args.eventName)
+  ];
+}
 function applyOtelSpanAttributeLimit(limit) {
   var _a, _b;
   try {
@@ -955,6 +1001,7 @@ var TraceShipper = class {
     const started = (_a = args.startTimeUnixNano) != null ? _a : nowUnixNanoString();
     const attrs = [
       attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args),
       attrString("ai.operationId", args.operationId)
     ];
     if ((_b = args.attributes) == null ? void 0 : _b.length) attrs.push(...args.attributes);
@@ -1010,7 +1057,8 @@ var TraceShipper = class {
     var _a;
     const ids = createSpanIds(args.parent);
     const attrs = [
-      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId)
+      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args)
     ];
     if ((_a = args.attributes) == null ? void 0 : _a.length) attrs.push(...args.attributes);
     const otlp = buildOtlpSpan({
@@ -1229,7 +1277,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.19",
+  version: "0.1.1",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1509,6 +1557,8 @@ function createSessionState(sessionId) {
   return {
     sessionId,
     currentInput: "",
+    turnOutputParts: [],
+    turnOutputTokens: 0,
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
     toolSpanStarts: /* @__PURE__ */ new Map(),
@@ -1614,7 +1664,7 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
     // event — session lifecycle + streaming parts
     // ------------------------------------------------------------------
     event: async ({ event }) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       try {
         const props = event.properties;
         const info = props["info"];
@@ -1739,6 +1789,10 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const outputText = state.outputParts.get(messageId);
           const reasoningText = state.reasoningParts.get(messageId);
           const isToolCallsCompletion = finishReason === "tool-calls";
+          if (outputText !== void 0 && outputText.trim().length > 0) {
+            state.turnOutputParts.push(outputText);
+          }
+          state.turnOutputTokens += outputTokens;
           const hasIntermediateReasoning = reasoningText !== void 0 && reasoningText.trim().length > 0;
           if (outputText === void 0 && !(isToolCallsCompletion && hasIntermediateReasoning))
             return;
@@ -1793,6 +1847,7 @@ type: ${name != null ? name : "UnknownError"}`;
             return;
           }
           if (outputText === void 0) return;
+          const turnOutputText = capText2(state.turnOutputParts.join("\n\n"));
           const rootSpan = state.currentRootSpan;
           const isCompaction = state.isCompacting === true;
           if (state.parentId) {
@@ -1804,7 +1859,7 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
+              attrString("ai.response.text", turnOutputText),
               attrString("gen_ai.system", providerID),
               attrString("gen_ai.request.model", modelID),
               attrString("gen_ai.response.model", modelID),
@@ -1856,7 +1911,7 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
+              attrString("ai.response.text", turnOutputText),
               attrString("gen_ai.system", providerID),
               attrString("gen_ai.request.model", modelID),
               attrString("gen_ai.response.model", modelID),
@@ -1885,8 +1940,8 @@ type: ${name != null ? name : "UnknownError"}`;
             }
           }
           state.currentRootSpan = void 0;
-          const hasAssistantResponse = outputText.trim().length > 0;
-          if (!hasAssistantResponse) {
+          const hasAssistantResponse = turnOutputText.trim().length > 0;
+          if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
             return;
@@ -1895,7 +1950,15 @@ type: ${name != null ? name : "UnknownError"}`;
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
               model: modelID,
-              output: outputText,
+              output: msgError ? void 0 : turnOutputText,
+              usage: {
+                promptTokens: inputTokens,
+                completionTokens: state.turnOutputTokens
+              },
+              error: msgError ? {
+                name: msgError.name,
+                message: (_g = (_f = (_e = msgError.data) == null ? void 0 : _e.message) != null ? _f : msgError.name) != null ? _g : "OpenCode request failed"
+              } : void 0,
               properties: {
                 plugin_version: PLUGIN_VERSION,
                 message_id: messageId,
@@ -1939,7 +2002,7 @@ type: ${name != null ? name : "UnknownError"}`;
           await Promise.all([eventShipper.flush(), traceShipper.flush()]);
           sessions.delete(String(sessionID));
         } else if (event.type === "session.error") {
-          const errorSessionID = (_e = props["sessionID"]) != null ? _e : sessionID;
+          const errorSessionID = (_h = props["sessionID"]) != null ? _h : sessionID;
           if (errorSessionID === void 0 || errorSessionID === "")
             throw new Error("session.error: missing sessionID");
           const state = sessions.get(String(errorSessionID));
@@ -1947,7 +2010,7 @@ type: ${name != null ? name : "UnknownError"}`;
           const errorObj = props["error"];
           if (errorObj == null) throw new Error("session.error: missing error object");
           const errorName = errorObj.name;
-          const errorMessage = (_g = (_f = errorObj.data) == null ? void 0 : _f.message) != null ? _g : errorObj.name;
+          const errorMessage = (_j = (_i = errorObj.data) == null ? void 0 : _i.message) != null ? _j : errorObj.name;
           if (errorName == null && errorMessage == null)
             throw new Error("session.error: error object must have name or data.message");
           const errorStr = `${errorMessage != null ? errorMessage : errorName}
@@ -2024,6 +2087,8 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         };
         const userText = capText2(textParts.join("\n"));
         state.currentInput = userText;
+        state.turnOutputParts = [];
+        state.turnOutputTokens = 0;
         if (state.parentId) {
           if (!state.parentTaskSpanIds || !state.parentEventContext) {
             return;
@@ -2241,6 +2306,21 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
 }
 
 // src/index.ts
+function createRaindropHandle(eventShipper, traceShipper) {
+  return {
+    users: {
+      async identify(users) {
+        await eventShipper.identify(users);
+      }
+    },
+    async flush() {
+      await Promise.all([eventShipper.flush(), traceShipper.flush()]);
+    },
+    async shutdown() {
+      await Promise.all([eventShipper.shutdown(), traceShipper.shutdown()]);
+    }
+  };
+}
 async function plugin(input) {
   var _a;
   const config = loadConfig(input.directory);
@@ -2286,7 +2366,7 @@ async function plugin(input) {
     eventShipper,
     traceShipper
   );
-  return hooks;
+  return { ...hooks, raindrop: createRaindropHandle(eventShipper, traceShipper) };
 }
 export {
   plugin as default

package/package.json

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