@raindrop-ai/claude-code 0.0.8 → 0.0.10

package/.claude-plugin/plugin.json

@@ -0,0 +1,14 @@
+{
+  "name": "raindrop",
+  "version": "0.0.10",
+  "description": "Observability for Claude Code \u2014 automatic session, tool call, and prompt tracing",
+  "author": {
+    "name": "Raindrop AI",
+    "email": "support@raindrop.ai"
+  },
+  "homepage": "https://docs.raindrop.ai/sdk/claude-code",
+  "repository": "https://github.com/raindrop-ai/claude-code-plugin",
+  "license": "MIT",
+  "hooks": "./hooks/hooks.json",
+  "mcpServers": "./.mcp.json"
+}

package/.mcp.json

@@ -0,0 +1,9 @@
+{
+  "mcpServers": {
+    "raindrop-diagnostics": {
+      "command": "${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code",
+      "args": ["mcp-serve"],
+      "transport": "stdio"
+    }
+  }
+}

package/dist/cli.js

@@ -654,7 +654,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = AsyncLocalStorage;
 
 // src/package-info.ts
 var PACKAGE_NAME = "@raindrop-ai/claude-code";
-var PACKAGE_VERSION = "0.0.8";
+var PACKAGE_VERSION = "0.0.10";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -1010,12 +1010,13 @@ function readTimestamp(key) {
   return Number.isFinite(ts) ? ts : void 0;
 }
 async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
-  var _a;
-  const convoId = payload.session_id;
+  var _a, _b;
+  const convoId = (_a = config.convoId) != null ? _a : payload.session_id;
   const baseProperties = {
     ...config.customProperties,
     cwd: payload.cwd,
     permission_mode: payload.permission_mode,
+    claude_code_session_id: payload.session_id,
     plugin_version: PACKAGE_VERSION,
     sdk: PACKAGE_NAME,
     sdk_version: PACKAGE_VERSION,
@@ -1024,7 +1025,7 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
   };
   switch (payload.hook_event_name) {
     case "SessionStart":
-      writeState(`model_${payload.session_id}`, (_a = payload.model) != null ? _a : "");
+      writeState(`model_${payload.session_id}`, (_b = payload.model) != null ? _b : "");
       tryCaptureAppendSystemPrompt(payload.session_id);
       break;
     case "UserPromptSubmit":
@@ -1040,10 +1041,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handlePostToolUseFailure(payload, getCurrentEventId(payload.session_id), traceShipper);
       break;
     case "Stop":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper);
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper);
       break;
     case "StopFailure":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper, {
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper, {
         error: payload.error,
         error_details: payload.error_details
       });
@@ -1061,10 +1062,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handleInstructionsLoaded(payload);
       break;
     case "PostCompact":
-      await handlePostCompact(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handlePostCompact(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       break;
     case "SessionEnd":
-      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       deleteState(turnEventKey(payload.session_id));
       deleteState(rootSpanKey(payload.session_id));
       deleteState(`model_${payload.session_id}`);
@@ -1214,11 +1215,11 @@ function handlePermissionDenied(payload, eventId, traceShipper) {
     }
   });
 }
-async function handlePostCompact(payload, eventId, config, properties, eventShipper) {
+async function handlePostCompact(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: true,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,
@@ -1508,7 +1509,7 @@ function buildStopOutput(summary, lastAssistantMessage) {
   }
   return finalMessage;
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+async function handleStopOrFailure(payload, eventId, convoId, config, properties, eventShipper, traceShipper, extraProperties) {
   const { summary, props: transcriptProps } = enrichFromTranscript(payload, eventId, traceShipper);
   const instructions = gatherInstructions(payload.session_id);
   const appendSysPrompt = readAppendSystemPrompt(payload.session_id);
@@ -1516,7 +1517,7 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
@@ -1529,10 +1530,11 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
     }
   });
 }
-async function handleSessionEnd(payload, eventId, config, properties, eventShipper) {
+async function handleSessionEnd(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,
@@ -1588,8 +1590,15 @@ function loadConfig() {
     writeKey: (_c = (_b = process.env["RAINDROP_WRITE_KEY"]) != null ? _b : file.write_key) != null ? _c : "",
     endpoint: (_e = (_d = process.env["RAINDROP_API_URL"]) != null ? _d : file.api_url) != null ? _e : "https://api.raindrop.ai/v1",
     userId: (_g = (_f = process.env["RAINDROP_USER_ID"]) != null ? _f : file.user_id) != null ? _g : systemUser,
-    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_h = file.debug) != null ? _h : false,
-    enabled: (_i = file.enabled) != null ? _i : true,
+    convoId: ((_h = process.env["RAINDROP_CONVO_ID"]) == null ? void 0 : _h.trim()) || void 0,
+    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_i = file.debug) != null ? _i : false,
+    enabled: (() => {
+      var _a2;
+      const env = process.env["RAINDROP_ENABLED"];
+      if (!env) return (_a2 = file.enabled) != null ? _a2 : true;
+      const lower = env.toLowerCase();
+      return lower !== "false" && env !== "0";
+    })(),
     eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
     customProperties,
     selfDiagnostics
@@ -1763,6 +1772,7 @@ async function handleHook() {
   }
   const mapperConfig = {
     userId: config.userId,
+    convoId: config.convoId,
     debug: config.debug,
     eventName: config.eventName,
     customProperties: config.customProperties
@@ -2043,6 +2053,62 @@ async function runSetup(args2) {
 `);
   }
 }
+function runUninstall(scope = "user") {
+  const settingsPath = getClaudeSettingsPath(scope, process.cwd());
+  const scopeLabel = scope === "project" ? "project" : "global";
+  if (!existsSync6(settingsPath)) {
+    console.log(`
+  No settings file found at ${settingsPath}. Nothing to uninstall.
+`);
+    return;
+  }
+  let settings;
+  try {
+    settings = JSON.parse(readFileSync6(settingsPath, "utf-8"));
+  } catch (e) {
+    console.error(`  Could not parse ${settingsPath}`);
+    process.exit(1);
+  }
+  const hooks = settings["hooks"];
+  let removedHooks = 0;
+  if (hooks) {
+    for (const event of Object.keys(hooks)) {
+      const groups = hooks[event];
+      if (!Array.isArray(groups)) continue;
+      const original = groups.length;
+      hooks[event] = groups.filter((group) => {
+        var _a;
+        const hookList = (_a = group.hooks) != null ? _a : [];
+        return !hookList.some(
+          (h) => typeof h["command"] === "string" && h["command"].includes("raindrop-claude-code")
+        );
+      });
+      removedHooks += original - hooks[event].length;
+      if (hooks[event].length === 0) {
+        delete hooks[event];
+      }
+    }
+    if (Object.keys(hooks).length === 0) {
+      delete settings["hooks"];
+    }
+  }
+  writeFileSync4(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+  let mcpRemoved = false;
+  try {
+    execSync2(`claude mcp remove raindrop-diagnostics --scope ${scope}`, { stdio: "ignore" });
+    mcpRemoved = true;
+  } catch (e) {
+  }
+  console.log(`
+  Raindrop uninstalled (${scopeLabel}):`);
+  console.log(`  - ${removedHooks} hook entries removed from ${settingsPath}`);
+  if (mcpRemoved) {
+    console.log(`  - raindrop-diagnostics MCP server deregistered`);
+  }
+  console.log(`
+  To reinstall, run: raindrop-claude-code setup
+`);
+}
 var DEBUG_LOG_PATH = "/tmp/raindrop-hooks.log";
 var DEBUG_PREFIX = "RAINDROP_DEBUG=true ";
 var TEE_SUFFIX = ` 2>&1 | tee -a ${DEBUG_LOG_PATH} || true`;
@@ -2448,6 +2514,11 @@ async function main() {
       console.log("  Raindrop hooks disabled.");
       break;
     }
+    case "uninstall": {
+      const uninstallScope = parseFlag("scope") === "project" ? "project" : "user";
+      runUninstall(uninstallScope);
+      break;
+    }
     case "debug-on": {
       const debugScope = parseFlag("scope") === "project" ? "project" : "user";
       toggleDebug(true, debugScope);
@@ -2484,6 +2555,8 @@ async function main() {
     hook                Handle a Claude Code hook event (reads JSON from stdin)
     mcp-serve           Start the self-diagnostics MCP server (stdio)
     status              Check local debugger connectivity
+    uninstall           Remove all Raindrop hooks from settings.json
+      --scope=SCOPE     "user" (default) or "project"
     enable              Enable Raindrop hooks
     disable             Disable Raindrop hooks
     debug-on            Enable debug logging to /tmp/raindrop-hooks.log
@@ -2494,11 +2567,14 @@ async function main() {
   Environment:
     RAINDROP_WRITE_KEY        API write key (alternative to --write-key or config file)
     RAINDROP_USER_ID          User ID override
+    RAINDROP_CONVO_ID         Conversation/thread ID override
     RAINDROP_EVENT_NAME       Custom event name (default: "claude_code_session")
     RAINDROP_PROPERTIES       JSON object merged into every event's properties
+    RAINDROP_ENABLED          Set to "false" to disable all telemetry
     RAINDROP_API_URL          Custom API endpoint
     RAINDROP_LOCAL_DEBUGGER   Local debugger URL (auto-detected if running on :5899)
     RAINDROP_DEBUG            Set to "true" for verbose logging
+    RAINDROP_SELF_DIAGNOSTICS JSON object to customize self-diagnostics signal categories
 `);
       if (!command || command === "help" || command === "--help" || command === "-h") {
         process.exit(0);

package/dist/index.cjs

@@ -690,7 +690,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = import_async_hooks.AsyncLocalStorage;
 
 // src/package-info.ts
 var PACKAGE_NAME = "@raindrop-ai/claude-code";
-var PACKAGE_VERSION = "0.0.8";
+var PACKAGE_VERSION = "0.0.10";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -774,8 +774,15 @@ function loadConfig() {
     writeKey: (_c = (_b = process.env["RAINDROP_WRITE_KEY"]) != null ? _b : file.write_key) != null ? _c : "",
     endpoint: (_e = (_d = process.env["RAINDROP_API_URL"]) != null ? _d : file.api_url) != null ? _e : "https://api.raindrop.ai/v1",
     userId: (_g = (_f = process.env["RAINDROP_USER_ID"]) != null ? _f : file.user_id) != null ? _g : systemUser,
-    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_h = file.debug) != null ? _h : false,
-    enabled: (_i = file.enabled) != null ? _i : true,
+    convoId: ((_h = process.env["RAINDROP_CONVO_ID"]) == null ? void 0 : _h.trim()) || void 0,
+    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_i = file.debug) != null ? _i : false,
+    enabled: (() => {
+      var _a2;
+      const env = process.env["RAINDROP_ENABLED"];
+      if (!env) return (_a2 = file.enabled) != null ? _a2 : true;
+      const lower = env.toLowerCase();
+      return lower !== "false" && env !== "0";
+    })(),
     eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
     customProperties,
     selfDiagnostics
@@ -1123,12 +1130,13 @@ function readTimestamp(key) {
   return Number.isFinite(ts) ? ts : void 0;
 }
 async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
-  var _a;
-  const convoId = payload.session_id;
+  var _a, _b;
+  const convoId = (_a = config.convoId) != null ? _a : payload.session_id;
   const baseProperties = {
     ...config.customProperties,
     cwd: payload.cwd,
     permission_mode: payload.permission_mode,
+    claude_code_session_id: payload.session_id,
     plugin_version: PACKAGE_VERSION,
     sdk: PACKAGE_NAME,
     sdk_version: PACKAGE_VERSION,
@@ -1137,7 +1145,7 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
   };
   switch (payload.hook_event_name) {
     case "SessionStart":
-      writeState(`model_${payload.session_id}`, (_a = payload.model) != null ? _a : "");
+      writeState(`model_${payload.session_id}`, (_b = payload.model) != null ? _b : "");
       tryCaptureAppendSystemPrompt(payload.session_id);
       break;
     case "UserPromptSubmit":
@@ -1153,10 +1161,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handlePostToolUseFailure(payload, getCurrentEventId(payload.session_id), traceShipper);
       break;
     case "Stop":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper);
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper);
       break;
     case "StopFailure":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper, {
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper, {
         error: payload.error,
         error_details: payload.error_details
       });
@@ -1174,10 +1182,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handleInstructionsLoaded(payload);
       break;
     case "PostCompact":
-      await handlePostCompact(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handlePostCompact(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       break;
     case "SessionEnd":
-      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       deleteState(turnEventKey(payload.session_id));
       deleteState(rootSpanKey(payload.session_id));
       deleteState(`model_${payload.session_id}`);
@@ -1327,11 +1335,11 @@ function handlePermissionDenied(payload, eventId, traceShipper) {
     }
   });
 }
-async function handlePostCompact(payload, eventId, config, properties, eventShipper) {
+async function handlePostCompact(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: true,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,
@@ -1621,7 +1629,7 @@ function buildStopOutput(summary, lastAssistantMessage) {
   }
   return finalMessage;
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+async function handleStopOrFailure(payload, eventId, convoId, config, properties, eventShipper, traceShipper, extraProperties) {
   const { summary, props: transcriptProps } = enrichFromTranscript(payload, eventId, traceShipper);
   const instructions = gatherInstructions(payload.session_id);
   const appendSysPrompt = readAppendSystemPrompt(payload.session_id);
@@ -1629,7 +1637,7 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
@@ -1642,10 +1650,11 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
     }
   });
 }
-async function handleSessionEnd(payload, eventId, config, properties, eventShipper) {
+async function handleSessionEnd(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,

package/dist/index.d.cts

@@ -244,6 +244,7 @@ interface RaindropConfig {
     writeKey: string;
     endpoint: string;
     userId: string;
+    convoId?: string;
     debug: boolean;
     enabled: boolean;
     eventName: string;
@@ -292,6 +293,7 @@ interface HookPayload {
 }
 interface MapperConfig {
     userId: string;
+    convoId?: string;
     debug: boolean;
     eventName: string;
     customProperties: Record<string, unknown>;
@@ -308,7 +310,7 @@ declare function mapHookToRaindrop(payload: HookPayload, config: MapperConfig, e
 declare function extractAppendSystemPrompt(args: string[]): string | undefined;
 
 declare const PACKAGE_NAME = "@raindrop-ai/claude-code";
-declare const PACKAGE_VERSION = "0.0.8";
+declare const PACKAGE_VERSION = "0.0.10";
 
 /** A tool call extracted from an assistant message content block. */
 interface LLMToolCall {

package/dist/index.d.ts

@@ -244,6 +244,7 @@ interface RaindropConfig {
     writeKey: string;
     endpoint: string;
     userId: string;
+    convoId?: string;
     debug: boolean;
     enabled: boolean;
     eventName: string;
@@ -292,6 +293,7 @@ interface HookPayload {
 }
 interface MapperConfig {
     userId: string;
+    convoId?: string;
     debug: boolean;
     eventName: string;
     customProperties: Record<string, unknown>;
@@ -308,7 +310,7 @@ declare function mapHookToRaindrop(payload: HookPayload, config: MapperConfig, e
 declare function extractAppendSystemPrompt(args: string[]): string | undefined;
 
 declare const PACKAGE_NAME = "@raindrop-ai/claude-code";
-declare const PACKAGE_VERSION = "0.0.8";
+declare const PACKAGE_VERSION = "0.0.10";
 
 /** A tool call extracted from an assistant message content block. */
 interface LLMToolCall {

package/dist/index.js

@@ -645,7 +645,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = AsyncLocalStorage;
 
 // src/package-info.ts
 var PACKAGE_NAME = "@raindrop-ai/claude-code";
-var PACKAGE_VERSION = "0.0.8";
+var PACKAGE_VERSION = "0.0.10";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -729,8 +729,15 @@ function loadConfig() {
     writeKey: (_c = (_b = process.env["RAINDROP_WRITE_KEY"]) != null ? _b : file.write_key) != null ? _c : "",
     endpoint: (_e = (_d = process.env["RAINDROP_API_URL"]) != null ? _d : file.api_url) != null ? _e : "https://api.raindrop.ai/v1",
     userId: (_g = (_f = process.env["RAINDROP_USER_ID"]) != null ? _f : file.user_id) != null ? _g : systemUser,
-    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_h = file.debug) != null ? _h : false,
-    enabled: (_i = file.enabled) != null ? _i : true,
+    convoId: ((_h = process.env["RAINDROP_CONVO_ID"]) == null ? void 0 : _h.trim()) || void 0,
+    debug: process.env["RAINDROP_DEBUG"] === "true" ? true : (_i = file.debug) != null ? _i : false,
+    enabled: (() => {
+      var _a2;
+      const env = process.env["RAINDROP_ENABLED"];
+      if (!env) return (_a2 = file.enabled) != null ? _a2 : true;
+      const lower = env.toLowerCase();
+      return lower !== "false" && env !== "0";
+    })(),
     eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
     customProperties,
     selfDiagnostics
@@ -1078,12 +1085,13 @@ function readTimestamp(key) {
   return Number.isFinite(ts) ? ts : void 0;
 }
 async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
-  var _a;
-  const convoId = payload.session_id;
+  var _a, _b;
+  const convoId = (_a = config.convoId) != null ? _a : payload.session_id;
   const baseProperties = {
     ...config.customProperties,
     cwd: payload.cwd,
     permission_mode: payload.permission_mode,
+    claude_code_session_id: payload.session_id,
     plugin_version: PACKAGE_VERSION,
     sdk: PACKAGE_NAME,
     sdk_version: PACKAGE_VERSION,
@@ -1092,7 +1100,7 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
   };
   switch (payload.hook_event_name) {
     case "SessionStart":
-      writeState(`model_${payload.session_id}`, (_a = payload.model) != null ? _a : "");
+      writeState(`model_${payload.session_id}`, (_b = payload.model) != null ? _b : "");
       tryCaptureAppendSystemPrompt(payload.session_id);
       break;
     case "UserPromptSubmit":
@@ -1108,10 +1116,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handlePostToolUseFailure(payload, getCurrentEventId(payload.session_id), traceShipper);
       break;
     case "Stop":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper);
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper);
       break;
     case "StopFailure":
-      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper, traceShipper, {
+      await handleStopOrFailure(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper, traceShipper, {
         error: payload.error,
         error_details: payload.error_details
       });
@@ -1129,10 +1137,10 @@ async function mapHookToRaindrop(payload, config, eventShipper, traceShipper) {
       handleInstructionsLoaded(payload);
       break;
     case "PostCompact":
-      await handlePostCompact(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handlePostCompact(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       break;
     case "SessionEnd":
-      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), config, baseProperties, eventShipper);
+      await handleSessionEnd(payload, getCurrentEventId(payload.session_id), convoId, config, baseProperties, eventShipper);
       deleteState(turnEventKey(payload.session_id));
       deleteState(rootSpanKey(payload.session_id));
       deleteState(`model_${payload.session_id}`);
@@ -1282,11 +1290,11 @@ function handlePermissionDenied(payload, eventId, traceShipper) {
     }
   });
 }
-async function handlePostCompact(payload, eventId, config, properties, eventShipper) {
+async function handlePostCompact(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: true,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,
@@ -1576,7 +1584,7 @@ function buildStopOutput(summary, lastAssistantMessage) {
   }
   return finalMessage;
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+async function handleStopOrFailure(payload, eventId, convoId, config, properties, eventShipper, traceShipper, extraProperties) {
   const { summary, props: transcriptProps } = enrichFromTranscript(payload, eventId, traceShipper);
   const instructions = gatherInstructions(payload.session_id);
   const appendSysPrompt = readAppendSystemPrompt(payload.session_id);
@@ -1584,7 +1592,7 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
     output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
@@ -1597,10 +1605,11 @@ async function handleStopOrFailure(payload, eventId, config, properties, eventSh
     }
   });
 }
-async function handleSessionEnd(payload, eventId, config, properties, eventShipper) {
+async function handleSessionEnd(payload, eventId, convoId, config, properties, eventShipper) {
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
+    convoId,
     eventName: config.eventName,
     properties: {
       ...properties,

package/hooks/hooks.json

@@ -0,0 +1,147 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PostToolUseFailure": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "SubagentStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "SubagentStop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "StopFailure": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "SessionEnd": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PostCompact": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "InstructionsLoaded": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
+    "PermissionDenied": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"${CLAUDE_PLUGIN_ROOT}/node_modules/.bin/raindrop-claude-code\" hook",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/claude-code",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Raindrop observability for Claude Code CLI \u2014 automatic session, tool call, and prompt tracing via hooks",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,10 @@
   "sideEffects": false,
   "files": [
     "dist/**",
-    "README.md"
+    "README.md",
+    ".claude-plugin/**",
+    "hooks/**",
+    ".mcp.json"
   ],
   "keywords": [
     "raindrop",