@raindrop-ai/opencode-plugin 0.0.18 → 0.1.0

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-WKRW55KX.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -39,6 +39,17 @@ function randomBytes(length) {
   for (let i = 0; i < out.length; i++) out[i] = Math.floor(Math.random() * 256);
   return out;
 }
+function randomUUID() {
+  const cryptoObj = getCrypto();
+  if (cryptoObj && typeof cryptoObj.randomUUID === "function") {
+    return cryptoObj.randomUUID();
+  }
+  const b = randomBytes(16);
+  b[6] = b[6] & 15 | 64;
+  b[8] = b[8] & 63 | 128;
+  const hex = [...b].map((x) => x.toString(16).padStart(2, "0")).join("");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
 function base64Encode(bytes) {
   const maybeBuffer = globalThis.Buffer;
   if (maybeBuffer) {
@@ -69,7 +80,7 @@ function base64Encode(bytes) {
   return out;
 }
 function generateId() {
-  return base64Encode(randomBytes(12)).replace(/[+/=]/g, "").slice(0, 16);
+  return randomUUID();
 }
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
@@ -406,16 +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;
+  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 = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
+  }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_c = target.attachments) != null ? _c : [], ...(_d = source.attachments) != null ? _d : []];
+    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();
@@ -664,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 = {
@@ -673,15 +725,17 @@ 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
       },
+      ...accumulated.featureFlags && Object.keys(accumulated.featureFlags).length > 0 ? { feature_flags: accumulated.featureFlags } : {},
       attachments: accumulated.attachments,
       is_pending: isPending
     };
@@ -835,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 {
@@ -959,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);
@@ -1014,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({
@@ -1233,7 +1296,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.18",
+  version: "0.1.0",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1618,7 +1681,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"];
@@ -1890,7 +1953,7 @@ type: ${name != null ? name : "UnknownError"}`;
           }
           state.currentRootSpan = void 0;
           const hasAssistantResponse = outputText.trim().length > 0;
-          if (!hasAssistantResponse) {
+          if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
             return;
@@ -1898,11 +1961,20 @@ type: ${name != null ? name : "UnknownError"}`;
           if (!state.parentId) {
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
-              model: modelName,
-              output: outputText,
+              model: modelID,
+              output: msgError ? void 0 : outputText,
+              usage: {
+                promptTokens: inputTokens,
+                completionTokens: outputTokens
+              },
+              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,
+                "ai.provider": providerID,
                 ...isCompaction ? { is_compaction: true } : {}
               }
             });
@@ -1942,7 +2014,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));
@@ -1950,7 +2022,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}
@@ -2010,7 +2082,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
                 promptMeta.properties = m["properties"];
             }
           } else if (part["type"] === "file") {
-            const mimeType = part["mediaType"];
+            const mimeType = part["mime"];
             const filename = part["filename"];
             const url = part["url"];
             if (url && (mimeType == null ? void 0 : mimeType.startsWith("image/"))) {
@@ -2244,6 +2316,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);
@@ -2289,5 +2376,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-WKRW55KX.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -20,6 +20,17 @@ function randomBytes(length) {
   for (let i = 0; i < out.length; i++) out[i] = Math.floor(Math.random() * 256);
   return out;
 }
+function randomUUID() {
+  const cryptoObj = getCrypto();
+  if (cryptoObj && typeof cryptoObj.randomUUID === "function") {
+    return cryptoObj.randomUUID();
+  }
+  const b = randomBytes(16);
+  b[6] = b[6] & 15 | 64;
+  b[8] = b[8] & 63 | 128;
+  const hex = [...b].map((x) => x.toString(16).padStart(2, "0")).join("");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
 function base64Encode(bytes) {
   const maybeBuffer = globalThis.Buffer;
   if (maybeBuffer) {
@@ -50,7 +61,7 @@ function base64Encode(bytes) {
   return out;
 }
 function generateId() {
-  return base64Encode(randomBytes(12)).replace(/[+/=]/g, "").slice(0, 16);
+  return randomUUID();
 }
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
@@ -387,16 +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;
+  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 = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
+  }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_c = target.attachments) != null ? _c : [], ...(_d = source.attachments) != null ? _d : []];
+    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();
@@ -645,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 = {
@@ -654,15 +706,17 @@ 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
       },
+      ...accumulated.featureFlags && Object.keys(accumulated.featureFlags).length > 0 ? { feature_flags: accumulated.featureFlags } : {},
       attachments: accumulated.attachments,
       is_pending: isPending
     };
@@ -816,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 {
@@ -940,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);
@@ -995,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({
@@ -1214,7 +1277,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.18",
+  version: "0.1.0",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1599,7 +1662,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"];
@@ -1871,7 +1934,7 @@ type: ${name != null ? name : "UnknownError"}`;
           }
           state.currentRootSpan = void 0;
           const hasAssistantResponse = outputText.trim().length > 0;
-          if (!hasAssistantResponse) {
+          if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
             return;
@@ -1879,11 +1942,20 @@ type: ${name != null ? name : "UnknownError"}`;
           if (!state.parentId) {
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
-              model: modelName,
-              output: outputText,
+              model: modelID,
+              output: msgError ? void 0 : outputText,
+              usage: {
+                promptTokens: inputTokens,
+                completionTokens: outputTokens
+              },
+              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,
+                "ai.provider": providerID,
                 ...isCompaction ? { is_compaction: true } : {}
               }
             });
@@ -1923,7 +1995,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));
@@ -1931,7 +2003,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}
@@ -1991,7 +2063,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
                 promptMeta.properties = m["properties"];
             }
           } else if (part["type"] === "file") {
-            const mimeType = part["mediaType"];
+            const mimeType = part["mime"];
             const filename = part["filename"];
             const url = part["url"];
             if (url && (mimeType == null ? void 0 : mimeType.startsWith("image/"))) {
@@ -2225,6 +2297,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);
@@ -2270,7 +2357,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.18",
+  "version": "0.1.0",
   "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.0.5"
+    "@raindrop-ai/core": "0.1.3"
   },
   "tsup": {
     "entry": [