@raindrop-ai/claude-code 0.0.8 → 0.0.9

package/dist/cli.js

@@ -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,
@@ -1547,7 +1549,7 @@ import { homedir, userInfo } from "os";
 import { dirname, join as join2 } from "path";
 var CONFIG_PATH = join2(homedir(), ".config", "raindrop", "config.json");
 function loadConfig() {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let file = {};
   try {
     if (existsSync3(CONFIG_PATH)) {
@@ -1588,9 +1590,10 @@ 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,
-    eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
+    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: (_j = file.enabled) != null ? _j : true,
+    eventName: (_l = (_k = process.env["RAINDROP_EVENT_NAME"]) != null ? _k : file.event_name) != null ? _l : "claude_code_session",
     customProperties,
     selfDiagnostics
   };
@@ -1763,6 +1766,7 @@ async function handleHook() {
   }
   const mapperConfig = {
     userId: config.userId,
+    convoId: config.convoId,
     debug: config.debug,
     eventName: config.eventName,
     customProperties: config.customProperties
@@ -2494,6 +2498,7 @@ 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_API_URL          Custom API endpoint

package/dist/index.cjs

@@ -733,7 +733,7 @@ var import_node_os = require("os");
 var import_node_path = require("path");
 var CONFIG_PATH = (0, import_node_path.join)((0, import_node_os.homedir)(), ".config", "raindrop", "config.json");
 function loadConfig() {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let file = {};
   try {
     if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
@@ -774,9 +774,10 @@ 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,
-    eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
+    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: (_j = file.enabled) != null ? _j : true,
+    eventName: (_l = (_k = process.env["RAINDROP_EVENT_NAME"]) != null ? _k : file.event_name) != null ? _l : "claude_code_session",
     customProperties,
     selfDiagnostics
   };
@@ -1123,12 +1124,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 +1139,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 +1155,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 +1176,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 +1329,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 +1623,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 +1631,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 +1644,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>;

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>;

package/dist/index.js

@@ -688,7 +688,7 @@ import { homedir, userInfo } from "os";
 import { dirname, join } from "path";
 var CONFIG_PATH = join(homedir(), ".config", "raindrop", "config.json");
 function loadConfig() {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let file = {};
   try {
     if (existsSync(CONFIG_PATH)) {
@@ -729,9 +729,10 @@ 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,
-    eventName: (_k = (_j = process.env["RAINDROP_EVENT_NAME"]) != null ? _j : file.event_name) != null ? _k : "claude_code_session",
+    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: (_j = file.enabled) != null ? _j : true,
+    eventName: (_l = (_k = process.env["RAINDROP_EVENT_NAME"]) != null ? _k : file.event_name) != null ? _l : "claude_code_session",
     customProperties,
     selfDiagnostics
   };
@@ -1078,12 +1079,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 +1094,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 +1110,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 +1131,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 +1284,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 +1578,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 +1586,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 +1599,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/claude-code",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Raindrop observability for Claude Code CLI \u2014 automatic session, tool call, and prompt tracing via hooks",
   "license": "MIT",
   "type": "module",