@raindrop-ai/opencode-plugin 0.0.5 → 0.0.6

package/dist/index.cjs

@@ -45,14 +45,91 @@ 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.6",
+  description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
+  type: "module",
+  main: "dist/index.cjs",
+  module: "dist/index.js",
+  types: "dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js",
+      require: "./dist/index.cjs"
+    }
+  },
+  sideEffects: false,
+  files: [
+    "dist/**"
+  ],
+  scripts: {
+    build: "tsup",
+    dev: "tsup --watch",
+    clean: "rm -rf dist",
+    test: "cd tests && pnpm test"
+  },
+  peerDependencies: {
+    "@opencode-ai/plugin": ">=1.2.0",
+    "@opencode-ai/sdk": ">=1.2.0"
+  },
+  peerDependenciesMeta: {
+    "@opencode-ai/sdk": {
+      optional: true
+    }
+  },
+  devDependencies: {
+    "@raindrop-ai/core": "workspace:*",
+    "@opencode-ai/plugin": "^1.2.0",
+    "@opencode-ai/sdk": "^1.2.0",
+    "@types/node": "^20.11.17",
+    tsup: "^8.4.0",
+    typescript: "^5.3.3"
+  },
+  tsup: {
+    entry: [
+      "src/index.ts"
+    ],
+    format: [
+      "cjs",
+      "esm"
+    ],
+    dts: {
+      resolve: true
+    },
+    clean: true,
+    noExternal: [
+      "@raindrop-ai/core"
+    ]
+  },
+  publishConfig: {
+    access: "public"
+  }
+};
+
+// src/package-info.ts
+var PLUGIN_NAME = package_default.name;
+var PLUGIN_VERSION = package_default.version;
+
 // ../core/dist/chunk-FTBZHS25.js
 function getCrypto() {
   const c = globalThis.crypto;
@@ -636,70 +713,6 @@ var TraceShipper = class {
   }
 };
 
-// package.json
-var package_default = {
-  name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.5",
-  description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
-  type: "module",
-  main: "dist/index.cjs",
-  module: "dist/index.js",
-  types: "dist/index.d.ts",
-  exports: {
-    ".": {
-      types: "./dist/index.d.ts",
-      import: "./dist/index.js",
-      require: "./dist/index.cjs"
-    }
-  },
-  sideEffects: false,
-  files: [
-    "dist/**"
-  ],
-  scripts: {
-    build: "tsup",
-    dev: "tsup --watch",
-    clean: "rm -rf dist",
-    test: "cd tests && yarn test"
-  },
-  peerDependencies: {
-    "@opencode-ai/plugin": ">=1.2.0",
-    "@opencode-ai/sdk": ">=1.2.0"
-  },
-  peerDependenciesMeta: {
-    "@opencode-ai/sdk": {
-      optional: true
-    }
-  },
-  devDependencies: {
-    "@raindrop-ai/core": "*",
-    "@opencode-ai/plugin": "^1.2.0",
-    "@opencode-ai/sdk": "^1.2.0",
-    "@types/node": "^20.11.17",
-    tsup: "^8.4.0",
-    typescript: "^5.3.3"
-  },
-  tsup: {
-    entry: [
-      "src/index.ts"
-    ],
-    format: [
-      "cjs",
-      "esm"
-    ],
-    dts: {
-      resolve: true
-    },
-    clean: true,
-    noExternal: [
-      "@raindrop-ai/core"
-    ]
-  },
-  publishConfig: {
-    access: "public"
-  }
-};
-
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
   constructor(opts) {
@@ -707,8 +720,8 @@ var EventShipper2 = class extends EventShipper {
     super({
       ...opts,
       sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
-      libraryName: (_b = opts.libraryName) != null ? _b : package_default.name,
-      libraryVersion: (_c = opts.libraryVersion) != null ? _c : package_default.version,
+      libraryName: (_b = opts.libraryName) != null ? _b : PLUGIN_NAME,
+      libraryVersion: (_c = opts.libraryVersion) != null ? _c : PLUGIN_VERSION,
       defaultEventName: (_d = opts.defaultEventName) != null ? _d : "opencode_session"
     });
   }
@@ -720,7 +733,7 @@ var TraceShipper2 = class extends TraceShipper {
       ...opts,
       sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
       serviceName: (_b = opts.serviceName) != null ? _b : "raindrop.opencode-plugin",
-      serviceVersion: (_c = opts.serviceVersion) != null ? _c : package_default.version
+      serviceVersion: (_c = opts.serviceVersion) != null ? _c : PLUGIN_VERSION
     });
   }
   enqueue(span) {
@@ -820,8 +833,6 @@ var pendingChildSessionsByCallKey = /* @__PURE__ */ new Map();
 function createSessionState(sessionId) {
   return {
     sessionId,
-    turnNumber: 0,
-    toolCount: 0,
     currentInput: "",
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
@@ -875,7 +886,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"];
@@ -1093,12 +1104,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
               }
             });
           }
@@ -1136,7 +1146,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));
@@ -1144,7 +1154,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}
@@ -1171,6 +1181,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);
@@ -1183,15 +1194,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"];
@@ -1203,6 +1223,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) {
@@ -1238,9 +1263,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: {
@@ -1248,8 +1273,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) {
@@ -1260,7 +1285,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);
@@ -1284,7 +1309,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
             }
           };
@@ -1325,7 +1350,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);
@@ -1379,12 +1403,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)}`
@@ -1401,6 +1419,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",

package/dist/index.js

@@ -26,14 +26,91 @@ 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.6",
+  description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
+  type: "module",
+  main: "dist/index.cjs",
+  module: "dist/index.js",
+  types: "dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js",
+      require: "./dist/index.cjs"
+    }
+  },
+  sideEffects: false,
+  files: [
+    "dist/**"
+  ],
+  scripts: {
+    build: "tsup",
+    dev: "tsup --watch",
+    clean: "rm -rf dist",
+    test: "cd tests && pnpm test"
+  },
+  peerDependencies: {
+    "@opencode-ai/plugin": ">=1.2.0",
+    "@opencode-ai/sdk": ">=1.2.0"
+  },
+  peerDependenciesMeta: {
+    "@opencode-ai/sdk": {
+      optional: true
+    }
+  },
+  devDependencies: {
+    "@raindrop-ai/core": "workspace:*",
+    "@opencode-ai/plugin": "^1.2.0",
+    "@opencode-ai/sdk": "^1.2.0",
+    "@types/node": "^20.11.17",
+    tsup: "^8.4.0",
+    typescript: "^5.3.3"
+  },
+  tsup: {
+    entry: [
+      "src/index.ts"
+    ],
+    format: [
+      "cjs",
+      "esm"
+    ],
+    dts: {
+      resolve: true
+    },
+    clean: true,
+    noExternal: [
+      "@raindrop-ai/core"
+    ]
+  },
+  publishConfig: {
+    access: "public"
+  }
+};
+
+// src/package-info.ts
+var PLUGIN_NAME = package_default.name;
+var PLUGIN_VERSION = package_default.version;
+
 // ../core/dist/chunk-FTBZHS25.js
 function getCrypto() {
   const c = globalThis.crypto;
@@ -617,70 +694,6 @@ var TraceShipper = class {
   }
 };
 
-// package.json
-var package_default = {
-  name: "@raindrop-ai/opencode-plugin",
-  version: "0.0.5",
-  description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
-  type: "module",
-  main: "dist/index.cjs",
-  module: "dist/index.js",
-  types: "dist/index.d.ts",
-  exports: {
-    ".": {
-      types: "./dist/index.d.ts",
-      import: "./dist/index.js",
-      require: "./dist/index.cjs"
-    }
-  },
-  sideEffects: false,
-  files: [
-    "dist/**"
-  ],
-  scripts: {
-    build: "tsup",
-    dev: "tsup --watch",
-    clean: "rm -rf dist",
-    test: "cd tests && yarn test"
-  },
-  peerDependencies: {
-    "@opencode-ai/plugin": ">=1.2.0",
-    "@opencode-ai/sdk": ">=1.2.0"
-  },
-  peerDependenciesMeta: {
-    "@opencode-ai/sdk": {
-      optional: true
-    }
-  },
-  devDependencies: {
-    "@raindrop-ai/core": "*",
-    "@opencode-ai/plugin": "^1.2.0",
-    "@opencode-ai/sdk": "^1.2.0",
-    "@types/node": "^20.11.17",
-    tsup: "^8.4.0",
-    typescript: "^5.3.3"
-  },
-  tsup: {
-    entry: [
-      "src/index.ts"
-    ],
-    format: [
-      "cjs",
-      "esm"
-    ],
-    dts: {
-      resolve: true
-    },
-    clean: true,
-    noExternal: [
-      "@raindrop-ai/core"
-    ]
-  },
-  publishConfig: {
-    access: "public"
-  }
-};
-
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
   constructor(opts) {
@@ -688,8 +701,8 @@ var EventShipper2 = class extends EventShipper {
     super({
       ...opts,
       sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
-      libraryName: (_b = opts.libraryName) != null ? _b : package_default.name,
-      libraryVersion: (_c = opts.libraryVersion) != null ? _c : package_default.version,
+      libraryName: (_b = opts.libraryName) != null ? _b : PLUGIN_NAME,
+      libraryVersion: (_c = opts.libraryVersion) != null ? _c : PLUGIN_VERSION,
       defaultEventName: (_d = opts.defaultEventName) != null ? _d : "opencode_session"
     });
   }
@@ -701,7 +714,7 @@ var TraceShipper2 = class extends TraceShipper {
       ...opts,
       sdkName: (_a = opts.sdkName) != null ? _a : "opencode-plugin",
       serviceName: (_b = opts.serviceName) != null ? _b : "raindrop.opencode-plugin",
-      serviceVersion: (_c = opts.serviceVersion) != null ? _c : package_default.version
+      serviceVersion: (_c = opts.serviceVersion) != null ? _c : PLUGIN_VERSION
     });
   }
   enqueue(span) {
@@ -801,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(),
@@ -856,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"];
@@ -1074,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
               }
             });
           }
@@ -1117,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));
@@ -1125,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}
@@ -1152,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);
@@ -1164,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"];
@@ -1184,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) {
@@ -1219,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: {
@@ -1229,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) {
@@ -1241,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);
@@ -1265,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
             }
           };
@@ -1306,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);
@@ -1360,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)}`
@@ -1382,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/opencode-plugin",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Raindrop observability plugin for OpenCode — automatic session/event/span tracing",
   "type": "module",
   "main": "dist/index.cjs",
@@ -21,7 +21,7 @@
     "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",
@@ -33,7 +33,7 @@
     }
   },
   "devDependencies": {
-    "@raindrop-ai/core": "*",
+    "@raindrop-ai/core": "workspace:*",
     "@opencode-ai/plugin": "^1.2.0",
     "@opencode-ai/sdk": "^1.2.0",
     "@types/node": "^20.11.17",