@raindrop-ai/opencode-plugin 0.0.4 → 0.0.6

package/dist/index.js

@@ -26,18 +26,27 @@ function loadConfig(projectDirectory) {
     } catch (e) {
     }
   }
+  let eventMetadata;
+  const envMeta = process.env["RAINDROP_EVENT_METADATA"];
+  if (envMeta) {
+    try {
+      eventMetadata = JSON.parse(envMeta);
+    } catch (e) {
+    }
+  }
   return {
     writeKey: (_b = (_a = process.env["RAINDROP_WRITE_KEY"]) != null ? _a : merged.write_key) != null ? _b : "",
     endpoint: (_d = (_c = process.env["RAINDROP_API_URL"]) != null ? _c : merged.api_url) != null ? _d : "https://api.raindrop.ai/v1",
     eventName: (_e = merged.event_name) != null ? _e : "opencode_session",
-    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_f = merged.debug) != null ? _f : false
+    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_f = merged.debug) != null ? _f : false,
+    eventMetadata
   };
 }
 
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.4",
+  version: "0.0.6",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.cjs",
@@ -58,7 +67,7 @@ var package_default = {
     build: "tsup",
     dev: "tsup --watch",
     clean: "rm -rf dist",
-    test: "cd tests && yarn test"
+    test: "cd tests && pnpm test"
   },
   peerDependencies: {
     "@opencode-ai/plugin": ">=1.2.0",
@@ -70,6 +79,7 @@ var package_default = {
     }
   },
   devDependencies: {
+    "@raindrop-ai/core": "workspace:*",
     "@opencode-ai/plugin": "^1.2.0",
     "@opencode-ai/sdk": "^1.2.0",
     "@types/node": "^20.11.17",
@@ -87,33 +97,44 @@ var package_default = {
     dts: {
       resolve: true
     },
-    clean: true
+    clean: true,
+    noExternal: [
+      "@raindrop-ai/core"
+    ]
   },
   publishConfig: {
     access: "public"
   }
 };
 
-// src/shipper.ts
+// src/package-info.ts
+var PLUGIN_NAME = package_default.name;
 var PLUGIN_VERSION = package_default.version;
-function getCryptoObj() {
-  return globalThis.crypto;
+
+// ../core/dist/chunk-FTBZHS25.js
+function getCrypto() {
+  const c = globalThis.crypto;
+  return c;
 }
 function randomBytes(length) {
-  const c = getCryptoObj();
+  const cryptoObj = getCrypto();
   const out = new Uint8Array(length);
-  if (c == null ? void 0 : c.getRandomValues) {
-    c.getRandomValues(out);
+  if (cryptoObj && typeof cryptoObj.getRandomValues === "function") {
+    cryptoObj.getRandomValues(out);
     return out;
   }
   for (let i = 0; i < out.length; i++) out[i] = Math.floor(Math.random() * 256);
   return out;
 }
 function base64Encode(bytes) {
-  const buf = globalThis.Buffer;
-  if (buf) return buf.from(bytes).toString("base64");
+  const maybeBuffer = globalThis.Buffer;
+  if (maybeBuffer) {
+    return maybeBuffer.from(bytes).toString("base64");
+  }
   let binary = "";
-  for (let i2 = 0; i2 < bytes.length; i2++) binary += String.fromCharCode(bytes[i2]);
+  for (let i2 = 0; i2 < bytes.length; i2++) {
+    binary += String.fromCharCode(bytes[i2]);
+  }
   const btoaFn = globalThis.btoa;
   if (typeof btoaFn === "function") return btoaFn(binary);
   const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -134,69 +155,9 @@ function base64Encode(bytes) {
   }
   return out;
 }
-var SERVICE_NAME = "raindrop.opencode-plugin";
-var SpanStatusCode = {
-  ERROR: 2
-};
 function generateId() {
   return base64Encode(randomBytes(12)).replace(/[+/=]/g, "").slice(0, 16);
 }
-function createSpanIds(parent) {
-  const traceId = parent ? parent.traceIdB64 : base64Encode(randomBytes(16));
-  const spanId = base64Encode(randomBytes(8));
-  return {
-    traceIdB64: traceId,
-    spanIdB64: spanId,
-    parentSpanIdB64: parent ? parent.spanIdB64 : void 0
-  };
-}
-function nowUnixNanoString() {
-  return Date.now().toString() + "000000";
-}
-function attrString(key, value) {
-  if (value === void 0) return void 0;
-  return { key, value: { stringValue: value } };
-}
-function attrInt(key, value) {
-  if (value === void 0) return void 0;
-  if (!Number.isFinite(value)) return void 0;
-  return { key, value: { intValue: String(Math.trunc(value)) } };
-}
-function buildOtlpSpan(args) {
-  const attrs = [
-    attrString("span.id", args.ids.spanIdB64),
-    attrString("span.parent.id", args.ids.parentSpanIdB64),
-    ...args.attributes
-  ].filter((x) => x !== void 0);
-  const span = {
-    traceId: args.ids.traceIdB64,
-    spanId: args.ids.spanIdB64,
-    name: args.name,
-    startTimeUnixNano: args.startTimeUnixNano,
-    endTimeUnixNano: args.endTimeUnixNano
-  };
-  if (args.ids.parentSpanIdB64) span.parentSpanId = args.ids.parentSpanIdB64;
-  if (attrs.length) span.attributes = attrs;
-  if (args.status) span.status = args.status;
-  return span;
-}
-function buildExportTraceServiceRequest(spans) {
-  return {
-    resourceSpans: [
-      {
-        resource: {
-          attributes: [{ key: "service.name", value: { stringValue: SERVICE_NAME } }]
-        },
-        scopeSpans: [
-          {
-            scope: { name: SERVICE_NAME, version: PLUGIN_VERSION },
-            spans
-          }
-        ]
-      }
-    ]
-  };
-}
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -209,7 +170,7 @@ function parseRetryAfter(headers) {
   const value = (_a = headers.get("Retry-After")) != null ? _a : headers.get("retry-after");
   if (!value) return void 0;
   const asNumber = Number(value);
-  if (!Number.isNaN(asNumber)) return asNumber * 1e3;
+  if (value.trim() !== "" && !Number.isNaN(asNumber)) return asNumber * 1e3;
   const asDate = new Date(value).getTime();
   if (!Number.isNaN(asDate)) {
     const delta = asDate - Date.now();
@@ -218,26 +179,29 @@ function parseRetryAfter(headers) {
   return void 0;
 }
 function getRetryDelayMs(attemptNumber, previousError) {
-  if (previousError !== null && typeof previousError === "object" && "retryAfterMs" in previousError) {
+  if (previousError && typeof previousError === "object" && previousError !== null && "retryAfterMs" in previousError) {
     const v = previousError.retryAfterMs;
     if (typeof v === "number") return Math.max(0, v);
   }
   if (attemptNumber <= 1) return 0;
-  return 500 * Math.pow(2, attemptNumber - 2);
+  const base = 500;
+  const factor = Math.pow(2, attemptNumber - 2);
+  return base * factor;
 }
 async function withRetry(operation, opName, opts) {
+  const prefix = opts.sdkName ? `[raindrop-ai/${opts.sdkName}]` : "[raindrop-ai/core]";
   let lastError = void 0;
-  for (let attempt = 1; attempt <= opts.maxAttempts; attempt++) {
-    if (attempt > 1) {
-      const delay = getRetryDelayMs(attempt, lastError);
+  for (let attemptNumber = 1; attemptNumber <= opts.maxAttempts; attemptNumber++) {
+    if (attemptNumber > 1) {
+      const delay = getRetryDelayMs(attemptNumber, lastError);
       if (opts.debug) {
         console.warn(
-          `[raindrop-ai/opencode-plugin] ${opName} retry ${attempt}/${opts.maxAttempts} in ${delay}ms`
+          `${prefix} ${opName} retry ${attemptNumber}/${opts.maxAttempts} in ${delay}ms`
         );
       }
       if (delay > 0) await wait(delay);
     } else if (opts.debug) {
-      console.log(`[raindrop-ai/opencode-plugin] ${opName} attempt ${attempt}/${opts.maxAttempts}`);
+      console.log(`${prefix} ${opName} attempt ${attemptNumber}/${opts.maxAttempts}`);
     }
     try {
       return await operation();
@@ -246,20 +210,26 @@ async function withRetry(operation, opName, opts) {
       if (opts.debug) {
         const msg = err instanceof Error ? err.message : String(err);
         console.warn(
-          `[raindrop-ai/opencode-plugin] ${opName} attempt ${attempt} failed: ${msg}${attempt === opts.maxAttempts ? " (no more retries)" : ""}`
+          `${prefix} ${opName} attempt ${attemptNumber} failed: ${msg}${attemptNumber === opts.maxAttempts ? " (no more retries)" : ""}`
         );
       }
-      if (attempt === opts.maxAttempts) break;
+      if (lastError && typeof lastError === "object" && "retryable" in lastError && !lastError.retryable)
+        break;
+      if (attemptNumber === opts.maxAttempts) break;
     }
   }
   throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
 async function postJson(url, body, headers, opts) {
+  const opName = `POST ${url}`;
   await withRetry(
     async () => {
       const resp = await fetch(url, {
         method: "POST",
-        headers: { "Content-Type": "application/json", ...headers },
+        headers: {
+          "Content-Type": "application/json",
+          ...headers
+        },
         body: JSON.stringify(body)
       });
       if (!resp.ok) {
@@ -269,13 +239,71 @@ async function postJson(url, body, headers, opts) {
         );
         const retryAfterMs = parseRetryAfter(resp.headers);
         if (typeof retryAfterMs === "number") err.retryAfterMs = retryAfterMs;
+        err.retryable = resp.status === 429 || resp.status >= 500;
         throw err;
       }
     },
-    `POST ${url}`,
+    opName,
     opts
   );
 }
+var SpanStatusCode = {
+  UNSET: 0,
+  OK: 1,
+  ERROR: 2
+};
+function createSpanIds(parent) {
+  const traceId = parent ? parent.traceIdB64 : base64Encode(randomBytes(16));
+  const spanId = base64Encode(randomBytes(8));
+  return {
+    traceIdB64: traceId,
+    spanIdB64: spanId,
+    parentSpanIdB64: parent ? parent.spanIdB64 : void 0
+  };
+}
+function nowUnixNanoString() {
+  return Date.now().toString() + "000000";
+}
+function attrString(key, value) {
+  if (value === void 0) return void 0;
+  return { key, value: { stringValue: value } };
+}
+function attrInt(key, value) {
+  if (value === void 0) return void 0;
+  if (!Number.isFinite(value)) return void 0;
+  return { key, value: { intValue: String(Math.trunc(value)) } };
+}
+function buildOtlpSpan(args) {
+  const attrs = args.attributes.filter((x) => x !== void 0);
+  const span = {
+    traceId: args.ids.traceIdB64,
+    spanId: args.ids.spanIdB64,
+    name: args.name,
+    startTimeUnixNano: args.startTimeUnixNano,
+    endTimeUnixNano: args.endTimeUnixNano
+  };
+  if (args.ids.parentSpanIdB64) span.parentSpanId = args.ids.parentSpanIdB64;
+  if (attrs.length) span.attributes = attrs;
+  if (args.status) span.status = args.status;
+  return span;
+}
+function buildExportTraceServiceRequest(spans, serviceName = "raindrop.core", serviceVersion = "0.0.0") {
+  return {
+    resourceSpans: [
+      {
+        resource: {
+          attributes: [{ key: "service.name", value: { stringValue: serviceName } }]
+        },
+        scopeSpans: [
+          {
+            scope: { name: serviceName, version: serviceVersion },
+            spans
+          }
+        ]
+      }
+    ]
+  };
+}
 function mergePatches(target, source) {
   var _a, _b, _c, _d;
   const out = { ...target, ...source };
@@ -293,34 +321,58 @@ var EventShipper = class {
     this.sticky = /* @__PURE__ */ new Map();
     this.timers = /* @__PURE__ */ new Map();
     this.inFlight = /* @__PURE__ */ new Set();
-    var _a, _b;
-    this.writeKey = opts.writeKey;
-    this.baseUrl = (_a = formatEndpoint(opts.endpoint)) != null ? _a : "https://api.raindrop.ai/v1/";
+    var _a, _b, _c, _d, _e, _f, _g;
+    this.writeKey = (_a = opts.writeKey) == null ? void 0 : _a.trim();
+    this.baseUrl = (_b = formatEndpoint(opts.endpoint)) != null ? _b : "https://api.raindrop.ai/v1/";
+    this.enabled = opts.enabled !== false;
     this.debug = opts.debug;
-    this.partialFlushMs = (_b = opts.partialFlushMs) != null ? _b : 1e3;
+    this.partialFlushMs = (_c = opts.partialFlushMs) != null ? _c : 1e3;
+    this.sdkName = (_d = opts.sdkName) != null ? _d : "core";
+    this.prefix = `[raindrop-ai/${this.sdkName}]`;
+    this.defaultEventName = (_e = opts.defaultEventName) != null ? _e : "ai_generation";
+    const isNode = typeof process !== "undefined" && typeof process.version === "string";
+    this.context = {
+      library: {
+        name: (_f = opts.libraryName) != null ? _f : "@raindrop-ai/core",
+        version: (_g = opts.libraryVersion) != null ? _g : "0.0.0"
+      },
+      metadata: {
+        jsRuntime: isNode ? "node" : "web",
+        ...isNode ? { nodeVersion: process.version } : {}
+      }
+    };
+  }
+  isDebugEnabled() {
+    return this.debug;
+  }
+  authHeaders() {
+    return this.writeKey ? { Authorization: `Bearer ${this.writeKey}` } : {};
   }
   async patch(eventId, patch) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    if (!eventId) return;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    if (!this.enabled) return;
+    if (!eventId || !eventId.trim()) return;
     if (this.debug) {
-      console.log("[raindrop-ai/opencode-plugin] queue patch", {
+      console.log(`${this.prefix} queue patch`, {
         eventId,
         userId: patch.userId,
+        eventName: patch.eventName,
         hasInput: typeof patch.input === "string" && patch.input.length > 0,
         hasOutput: typeof patch.output === "string" && patch.output.length > 0,
+        attachments: (_b = (_a = patch.attachments) == null ? void 0 : _a.length) != null ? _b : 0,
         isPending: patch.isPending
       });
     }
-    const sticky = (_a = this.sticky.get(eventId)) != null ? _a : {};
-    const existing = (_b = this.buffers.get(eventId)) != null ? _b : {};
+    const sticky = (_c = this.sticky.get(eventId)) != null ? _c : {};
+    const existing = (_d = this.buffers.get(eventId)) != null ? _d : {};
     const merged = mergePatches(existing, patch);
-    merged.isPending = (_e = (_d = (_c = patch.isPending) != null ? _c : existing.isPending) != null ? _d : sticky.isPending) != null ? _e : true;
+    merged.isPending = (_g = (_f = (_e = patch.isPending) != null ? _e : existing.isPending) != null ? _f : sticky.isPending) != null ? _g : true;
     this.buffers.set(eventId, merged);
     this.sticky.set(eventId, {
-      userId: (_f = merged.userId) != null ? _f : sticky.userId,
-      convoId: (_g = merged.convoId) != null ? _g : sticky.convoId,
-      eventName: (_h = merged.eventName) != null ? _h : sticky.eventName,
-      isPending: (_i = merged.isPending) != null ? _i : sticky.isPending
+      userId: (_h = merged.userId) != null ? _h : sticky.userId,
+      convoId: (_i = merged.convoId) != null ? _i : sticky.convoId,
+      eventName: (_j = merged.eventName) != null ? _j : sticky.eventName,
+      isPending: (_k = merged.isPending) != null ? _k : sticky.isPending
     });
     const t = this.timers.get(eventId);
     if (t) clearTimeout(t);
@@ -338,6 +390,7 @@ var EventShipper = class {
     await this.patch(eventId, { ...patch, isPending: false });
   }
   async flush() {
+    if (!this.enabled) return;
     const ids = [...this.buffers.keys()];
     await Promise.all(ids.map((id) => this.flushOne(id)));
     await Promise.all([...this.inFlight].map((p) => p.catch(() => {
@@ -348,8 +401,70 @@ var EventShipper = class {
     this.timers.clear();
     await this.flush();
   }
+  async trackSignal(signal) {
+    var _a, _b;
+    if (!this.enabled) return;
+    const body = [
+      {
+        event_id: signal.eventId,
+        signal_name: signal.name,
+        signal_type: (_a = signal.type) != null ? _a : "default",
+        timestamp: signal.timestamp,
+        sentiment: signal.sentiment,
+        attachment_id: signal.attachmentId,
+        properties: {
+          ...(_b = signal.properties) != null ? _b : {},
+          ...signal.comment ? { comment: signal.comment } : {},
+          ...signal.after ? { after: signal.after } : {}
+        }
+      }
+    ];
+    const url = `${this.baseUrl}signals/track`;
+    try {
+      await postJson(url, body, this.authHeaders(), {
+        maxAttempts: 3,
+        debug: this.debug,
+        sdkName: this.sdkName
+      });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(`${this.prefix} failed to send signal (dropping): ${msg}`);
+    }
+  }
+  async identify(users) {
+    if (!this.enabled) return;
+    const list = Array.isArray(users) ? users : [users];
+    const body = list.filter((user) => {
+      if (!(user == null ? void 0 : user.userId) || !user.userId.trim()) {
+        if (this.debug) {
+          console.warn(`${this.prefix} skipping identify: missing userId`);
+        }
+        return false;
+      }
+      return true;
+    }).map((user) => {
+      var _a;
+      return {
+        user_id: user.userId,
+        traits: (_a = user.traits) != null ? _a : {}
+      };
+    });
+    if (body.length === 0) return;
+    const url = `${this.baseUrl}users/identify`;
+    try {
+      await postJson(url, body, this.authHeaders(), {
+        maxAttempts: 3,
+        debug: this.debug,
+        sdkName: this.sdkName
+      });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(`${this.prefix} failed to send identify (dropping): ${msg}`);
+    }
+  }
   async flushOne(eventId) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    if (!this.enabled) return;
     const timer = this.timers.get(eventId);
     if (timer) {
       clearTimeout(timer);
@@ -359,105 +474,123 @@ var EventShipper = class {
     this.buffers.delete(eventId);
     if (!accumulated) return;
     const sticky = (_a = this.sticky.get(eventId)) != null ? _a : {};
-    const eventName = (_c = (_b = accumulated.eventName) != null ? _b : sticky.eventName) != null ? _c : "opencode_session";
+    const eventName = (_c = (_b = accumulated.eventName) != null ? _b : sticky.eventName) != null ? _c : this.defaultEventName;
     const userId = (_d = accumulated.userId) != null ? _d : sticky.userId;
     if (!userId) {
       if (this.debug) {
-        console.warn(
-          `[raindrop-ai/opencode-plugin] skipping track_partial for ${eventId}: missing userId`
-        );
+        console.warn(`${this.prefix} skipping track_partial for ${eventId}: missing userId`);
       }
+      this.sticky.delete(eventId);
       return;
     }
+    const { wizardSession, ...restProperties } = (_e = accumulated.properties) != null ? _e : {};
     const payload = {
       event_id: eventId,
       user_id: userId,
       event: eventName,
-      timestamp: (_e = accumulated.timestamp) != null ? _e : (/* @__PURE__ */ new Date()).toISOString(),
+      timestamp: (_f = accumulated.timestamp) != null ? _f : (/* @__PURE__ */ new Date()).toISOString(),
       ai_data: {
         input: accumulated.input,
         output: accumulated.output,
         model: accumulated.model,
-        convo_id: (_f = accumulated.convoId) != null ? _f : sticky.convoId
+        convo_id: (_g = accumulated.convoId) != null ? _g : sticky.convoId
       },
       properties: {
-        ...(_g = accumulated.properties) != null ? _g : {},
-        $context: {
-          library: { name: "@raindrop-ai/opencode-plugin", version: PLUGIN_VERSION },
-          metadata: { jsRuntime: "node" }
-        }
+        ...restProperties,
+        ...wizardSession ? { "raindrop.wizardSession": wizardSession } : {},
+        $context: this.context
       },
       attachments: accumulated.attachments,
       is_pending: ((_i = (_h = accumulated.isPending) != null ? _h : sticky.isPending) != null ? _i : true) !== false
     };
     const url = `${this.baseUrl}events/track_partial`;
     if (this.debug) {
-      console.log("[raindrop-ai/opencode-plugin] sending track_partial", {
+      console.log(`${this.prefix} sending track_partial`, {
         eventId,
         eventName,
         userId,
-        isPending: payload["is_pending"],
+        isPending: payload.is_pending,
         inputPreview: typeof accumulated.input === "string" ? accumulated.input.slice(0, 120) : void 0,
         outputPreview: typeof accumulated.output === "string" ? accumulated.output.slice(0, 120) : void 0,
+        attachments: (_k = (_j = accumulated.attachments) == null ? void 0 : _j.length) != null ? _k : 0,
+        attachmentKinds: (_m = (_l = accumulated.attachments) == null ? void 0 : _l.map((a) => ({
+          type: a.type,
+          role: a.role,
+          name: a.name,
+          valuePreview: a.value.slice(0, 60)
+        }))) != null ? _m : [],
         endpoint: url
       });
     }
-    const p = postJson(
-      url,
-      payload,
-      { Authorization: `Bearer ${this.writeKey}` },
-      { maxAttempts: 3, debug: this.debug }
-    );
+    const p = postJson(url, payload, this.authHeaders(), {
+      maxAttempts: 3,
+      debug: this.debug,
+      sdkName: this.sdkName
+    });
     this.inFlight.add(p);
     try {
       try {
         await p;
         if (this.debug) {
-          console.log(`[raindrop-ai/opencode-plugin] sent track_partial ${eventId} (${eventName})`);
+          console.log(`${this.prefix} sent track_partial ${eventId} (${eventName})`);
         }
       } catch (err) {
-        if (this.debug) {
-          const msg = err instanceof Error ? err.message : String(err);
-          console.warn(
-            `[raindrop-ai/opencode-plugin] failed to send track_partial (dropping): ${msg}`
-          );
-        }
+        const msg = err instanceof Error ? err.message : String(err);
+        console.warn(`${this.prefix} failed to send track_partial (dropping): ${msg}`);
       }
     } finally {
       this.inFlight.delete(p);
     }
-    if (!payload["is_pending"]) this.sticky.delete(eventId);
+    const isPending = payload.is_pending;
+    if (!isPending) {
+      this.sticky.delete(eventId);
+    }
   }
 };
 var TraceShipper = class {
   constructor(opts) {
     this.queue = [];
     this.inFlight = /* @__PURE__ */ new Set();
-    var _a, _b;
-    this.writeKey = opts.writeKey;
-    this.baseUrl = (_a = formatEndpoint(opts.endpoint)) != null ? _a : "https://api.raindrop.ai/v1/";
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    this.writeKey = (_a = opts.writeKey) == null ? void 0 : _a.trim();
+    this.baseUrl = (_b = formatEndpoint(opts.endpoint)) != null ? _b : "https://api.raindrop.ai/v1/";
+    this.enabled = opts.enabled !== false;
     this.debug = opts.debug;
-    this.flushIntervalMs = (_b = opts.flushIntervalMs) != null ? _b : 1e3;
-    this.maxBatchSize = 50;
-    this.maxQueueSize = 5e3;
+    this.debugSpans = opts.debugSpans === true;
+    this.flushIntervalMs = (_c = opts.flushIntervalMs) != null ? _c : 1e3;
+    this.maxBatchSize = (_d = opts.maxBatchSize) != null ? _d : 50;
+    this.maxQueueSize = (_e = opts.maxQueueSize) != null ? _e : 5e3;
+    this.sdkName = (_f = opts.sdkName) != null ? _f : "core";
+    this.prefix = `[raindrop-ai/${this.sdkName}]`;
+    this.serviceName = (_g = opts.serviceName) != null ? _g : "raindrop.core";
+    this.serviceVersion = (_h = opts.serviceVersion) != null ? _h : "0.0.0";
+  }
+  isDebugEnabled() {
+    return this.debug;
+  }
+  authHeaders() {
+    return this.writeKey ? { Authorization: `Bearer ${this.writeKey}` } : {};
   }
   startSpan(args) {
-    var _a;
+    var _a, _b;
     const ids = createSpanIds(args.parent);
-    const started = nowUnixNanoString();
+    const started = (_a = args.startTimeUnixNano) != null ? _a : nowUnixNanoString();
     const attrs = [
-      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId)
+      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      attrString("ai.operationId", args.operationId)
     ];
-    if ((_a = args.attributes) == null ? void 0 : _a.length) attrs.push(...args.attributes);
+    if ((_b = args.attributes) == null ? void 0 : _b.length) attrs.push(...args.attributes);
     return { ids, name: args.name, startTimeUnixNano: started, attributes: attrs };
   }
   endSpan(span, extra) {
-    var _a;
+    var _a, _b;
     if (span.endTimeUnixNano) return;
-    span.endTimeUnixNano = nowUnixNanoString();
-    if ((_a = extra == null ? void 0 : extra.attributes) == null ? void 0 : _a.length) span.attributes.push(...extra.attributes);
-    let status;
-    if ((extra == null ? void 0 : extra.error) !== void 0) {
+    span.endTimeUnixNano = (_a = extra == null ? void 0 : extra.endTimeUnixNano) != null ? _a : nowUnixNanoString();
+    if ((_b = extra == null ? void 0 : extra.attributes) == null ? void 0 : _b.length) {
+      span.attributes.push(...extra.attributes);
+    }
+    let status = extra == null ? void 0 : extra.status;
+    if (!status && (extra == null ? void 0 : extra.error) !== void 0) {
       const message = extra.error instanceof Error ? extra.error.message : String(extra.error);
       status = { code: SpanStatusCode.ERROR, message };
     }
@@ -471,10 +604,6 @@ var TraceShipper = class {
     });
     this.enqueue(otlp);
   }
-  /**
-   * Create and enqueue a span with both start and end times (atomic insert).
-   * Used for tool spans and any span whose full duration is known at write time.
-   */
   createSpan(args) {
     var _a;
     const ids = createSpanIds(args.parent);
@@ -493,7 +622,18 @@ var TraceShipper = class {
     this.enqueue(otlp);
   }
   enqueue(span) {
-    if (this.queue.length >= this.maxQueueSize) this.queue.shift();
+    if (!this.enabled) return;
+    if (this.debugSpans) {
+      const short = (s) => s ? s.slice(-8) : "none";
+      console.log(
+        `${this.prefix}[span] name=${span.name} trace=${short(span.traceId)} span=${short(span.spanId)} parent=${short(
+          span.parentSpanId
+        )}`
+      );
+    }
+    if (this.queue.length >= this.maxQueueSize) {
+      this.queue.shift();
+    }
     this.queue.push(span);
     if (this.queue.length >= this.maxBatchSize) {
       void this.flush().catch(() => {
@@ -509,42 +649,34 @@ var TraceShipper = class {
     }
   }
   async flush() {
+    if (!this.enabled) return;
     if (this.timer) {
       clearTimeout(this.timer);
       this.timer = void 0;
     }
     while (this.queue.length > 0) {
       const batch = this.queue.splice(0, this.maxBatchSize);
-      const body = buildExportTraceServiceRequest(batch);
+      const body = buildExportTraceServiceRequest(batch, this.serviceName, this.serviceVersion);
       const url = `${this.baseUrl}traces`;
-      const spanNames = batch.map((span) => span.name);
       if (this.debug) {
-        console.log("[raindrop-ai/opencode-plugin] sending traces batch", {
+        console.log(`${this.prefix} sending traces batch`, {
           spans: batch.length,
-          endpoint: url,
-          spanNames
+          endpoint: url
         });
       }
-      const p = postJson(
-        url,
-        body,
-        { Authorization: `Bearer ${this.writeKey}` },
-        { maxAttempts: 3, debug: this.debug }
-      );
+      const p = postJson(url, body, this.authHeaders(), {
+        maxAttempts: 3,
+        debug: this.debug,
+        sdkName: this.sdkName
+      });
       this.inFlight.add(p);
       try {
         try {
           await p;
-          if (this.debug) {
-            console.log(`[raindrop-ai/opencode-plugin] sent ${batch.length} spans`, {
-              spanNames
-            });
-          }
+          if (this.debug) console.log(`${this.prefix} sent ${batch.length} spans`);
         } catch (err) {
-          if (this.debug) {
-            const msg = err instanceof Error ? err.message : String(err);
-            console.warn(`[raindrop-ai/opencode-plugin] failed to send spans (dropping): ${msg}`);
-          }
+          const msg = err instanceof Error ? err.message : String(err);
+          console.warn(`${this.prefix} failed to send ${batch.length} spans: ${msg}`);
         }
       } finally {
         this.inFlight.delete(p);
@@ -562,6 +694,41 @@ var TraceShipper = class {
   }
 };
 
+// src/shipper.ts
+var EventShipper2 = class extends EventShipper {
+  constructor(opts) {
+    var _a, _b, _c, _d;
+    super({
+      ...opts,
+      sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
+      libraryName: (_b = opts.libraryName) != null ? _b : PLUGIN_NAME,
+      libraryVersion: (_c = opts.libraryVersion) != null ? _c : PLUGIN_VERSION,
+      defaultEventName: (_d = opts.defaultEventName) != null ? _d : "opencode_session"
+    });
+  }
+};
+var TraceShipper2 = class extends TraceShipper {
+  constructor(opts) {
+    var _a, _b, _c;
+    super({
+      ...opts,
+      sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
+      serviceName: (_b = opts.serviceName) != null ? _b : "raindrop.opencode-plugin",
+      serviceVersion: (_c = opts.serviceVersion) != null ? _c : PLUGIN_VERSION
+    });
+  }
+  enqueue(span) {
+    var _a;
+    const attrs = (_a = span.attributes) != null ? _a : [];
+    attrs.unshift(
+      { key: "span.id", value: { stringValue: span.spanId } },
+      ...span.parentSpanId ? [{ key: "span.parent.id", value: { stringValue: span.parentSpanId } }] : []
+    );
+    span.attributes = attrs;
+    super.enqueue(span);
+  }
+};
+
 // src/tracing-linkage-helpers.ts
 function createSessionParentMapHelpers({
   sessions: sessions2,
@@ -647,8 +814,6 @@ var pendingChildSessionsByCallKey = /* @__PURE__ */ new Map();
 function createSessionState(sessionId) {
   return {
     sessionId,
-    turnNumber: 0,
-    toolCount: 0,
     currentInput: "",
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
@@ -702,7 +867,7 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
     // event — session lifecycle + streaming parts
     // ------------------------------------------------------------------
     event: async ({ event }) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g;
       try {
         const props = event.properties;
         const info = props["info"];
@@ -920,12 +1085,11 @@ type: ${name != null ? name : "UnknownError"}`;
           }
           if (!state.parentId) {
             await eventShipper.finish(state.currentEventId, {
-              userId: state.sessionId,
+              userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
               model: modelName,
               output: outputText,
               properties: {
-                turn_count: state.turnNumber,
-                tool_count: state.toolCount
+                plugin_version: PLUGIN_VERSION
               }
             });
           }
@@ -963,7 +1127,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 = (_c = props["sessionID"]) != null ? _c : sessionID;
+          const errorSessionID = (_e = props["sessionID"]) != null ? _e : sessionID;
           if (errorSessionID === void 0 || errorSessionID === "")
             throw new Error("session.error: missing sessionID");
           const state = sessions.get(String(errorSessionID));
@@ -971,7 +1135,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 = (_e = (_d = errorObj.data) == null ? void 0 : _d.message) != null ? _e : errorObj.name;
+          const errorMessage = (_g = (_f = errorObj.data) == null ? void 0 : _f.message) != null ? _g : 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}
@@ -998,6 +1162,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
     // chat.message — user sent a message; start a new turn with a fresh event ID
     // ------------------------------------------------------------------
     "chat.message": async (messageInput, output) => {
+      var _a, _b, _c, _d, _e, _f, _g;
       try {
         const { sessionID } = messageInput;
         let state = sessions.get(sessionID);
@@ -1010,15 +1175,24 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
           traceShipper.endSpan(state.currentRootSpan);
           state.currentRootSpan = void 0;
         }
-        state.turnNumber++;
         if (output == null) throw new Error("chat.message: output is required");
         const parts = output.parts;
         if (parts == null) throw new Error("chat.message: output.parts is required");
         const textParts = [];
         const newAttachments = [];
+        const baseMeta = { ...config.eventMetadata };
+        const promptMeta = {};
         for (const part of parts) {
           if (part["type"] === "text" && typeof part["text"] === "string") {
             textParts.push(part["text"]);
+            const meta = part["metadata"];
+            if (meta != null && typeof meta === "object") {
+              const m = meta;
+              if (typeof m["userId"] === "string") promptMeta.userId = m["userId"];
+              if (typeof m["eventName"] === "string") promptMeta.eventName = m["eventName"];
+              if (m["properties"] != null && typeof m["properties"] === "object")
+                promptMeta.properties = m["properties"];
+            }
           } else if (part["type"] === "file") {
             const mimeType = part["mediaType"];
             const filename = part["filename"];
@@ -1030,6 +1204,11 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             }
           }
         }
+        state.eventMetadata = {
+          ...baseMeta,
+          ...promptMeta,
+          properties: baseMeta.properties || promptMeta.properties ? { ...(_a = baseMeta.properties) != null ? _a : {}, ...(_b = promptMeta.properties) != null ? _b : {} } : void 0
+        };
         const userText = textParts.join("\n");
         state.currentInput = userText;
         if (state.parentId) {
@@ -1065,9 +1244,9 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         });
         await eventShipper.patch(state.currentEventId, {
           isPending: true,
-          userId: state.sessionId,
+          userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
           convoId: state.sessionId,
-          eventName: config.eventName,
+          eventName: (_f = (_e = state.eventMetadata) == null ? void 0 : _e.eventName) != null ? _f : config.eventName,
           input: userText,
           ...newAttachments.length > 0 ? { attachments: newAttachments } : {},
           properties: {
@@ -1075,8 +1254,8 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             directory,
             hostname,
             os,
-            turn_count: state.turnNumber,
-            tool_count: state.toolCount
+            plugin_version: PLUGIN_VERSION,
+            ...(_g = state.eventMetadata) == null ? void 0 : _g.properties
           }
         });
       } catch (err) {
@@ -1087,7 +1266,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
     // For child sessions, tool spans are parented directly to the parent task span.
     // ------------------------------------------------------------------
     "tool.execute.before": async (toolInput, _output) => {
-      var _a;
+      var _a, _b, _c;
       try {
         const { tool, sessionID, callID } = toolInput;
         const state = sessions.get(sessionID);
@@ -1111,7 +1290,7 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             ids: liveTaskSpan.ids,
             eventContext: {
               eventId: state.currentEventId,
-              userId: state.sessionId,
+              userId: (_c = (_b = state.eventMetadata) == null ? void 0 : _b.userId) != null ? _c : state.sessionId,
               convoId: state.sessionId
             }
           };
@@ -1152,7 +1331,6 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         const { tool, sessionID, callID, args } = toolInput;
         const state = sessions.get(sessionID);
         if (!state || !state.currentEventId) return;
-        state.toolCount++;
         if (args === void 0 || args === null)
           throw new Error("tool.execute.after: args is required");
         const toolCallArgs = typeof args === "string" ? args : JSON.stringify(args);
@@ -1206,12 +1384,6 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
             if (running.size === 0) runningTaskCallsBySession.delete(sessionID);
           }
         }
-        if (!state.parentId) {
-          await eventShipper.patch(state.currentEventId, {
-            userId: state.sessionId,
-            properties: { tool_count: state.toolCount }
-          });
-        }
       } catch (err) {
         console.log(
           `[raindrop-ai/opencode-plugin] [error] Error in tool.execute.after hook: ${err instanceof Error ? err.message : String(err)}`
@@ -1228,6 +1400,7 @@ async function plugin(input) {
   function appLog(level, message) {
     console.log(`[raindrop-ai/opencode-plugin] [${level}] ${message}`);
   }
+  appLog("info", `Loading ${PLUGIN_NAME} v${PLUGIN_VERSION}`);
   if (!config.writeKey) {
     appLog(
       "warn",
@@ -1238,12 +1411,12 @@ async function plugin(input) {
   if (config.debug) {
     appLog("info", `Raindrop tracing enabled (endpoint: ${config.endpoint})`);
   }
-  const eventShipper = new EventShipper({
+  const eventShipper = new EventShipper2({
     writeKey: config.writeKey,
     endpoint: config.endpoint,
     debug: config.debug
   });
-  const traceShipper = new TraceShipper({
+  const traceShipper = new TraceShipper2({
     writeKey: config.writeKey,
     endpoint: config.endpoint,
     debug: config.debug