@raindrop-ai/claude-code 0.0.7 → 0.0.9

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.7";
+var PACKAGE_VERSION = "0.0.8";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -693,9 +693,47 @@ var TraceShipper2 = class extends TraceShipper {
 
 // src/transcript.ts
 import { existsSync, readFileSync } from "fs";
+function isToolResultContentBlock(value) {
+  return Boolean(
+    value && typeof value === "object" && "type" in value && value["type"] === "tool_result"
+  );
+}
+function isTopLevelUserPrompt(entry) {
+  var _a;
+  if (entry.type !== "user") return false;
+  const content = (_a = entry.message) == null ? void 0 : _a.content;
+  if (typeof content === "string") return true;
+  if (!Array.isArray(content)) return false;
+  return content.some((block) => !isToolResultContentBlock(block));
+}
 function parseTranscript(transcriptPath) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   try {
+    let finalizePhase2 = function() {
+      if (activePhase && (activePhase.text || activePhase.toolCalls.length > 0)) {
+        currentPhases.push(activePhase);
+      }
+      activePhase = void 0;
+    }, ensurePhase2 = function() {
+      if (!activePhase) {
+        activePhase = {
+          text: "",
+          toolCalls: [],
+          inputTokens: 0,
+          outputTokens: 0,
+          cacheReadTokens: 0,
+          hasThinking: false
+        };
+      }
+      return activePhase;
+    }, isToolResultUserEntry2 = function(entry) {
+      var _a2;
+      if (entry.type !== "user") return false;
+      const content2 = (_a2 = entry.message) == null ? void 0 : _a2.content;
+      if (!Array.isArray(content2)) return false;
+      return content2.length > 0 && content2.every((b) => isToolResultContentBlock(b));
+    };
+    var finalizePhase = finalizePhase2, ensurePhase = ensurePhase2, isToolResultUserEntry = isToolResultUserEntry2;
     if (!existsSync(transcriptPath)) return void 0;
     const content = readFileSync(transcriptPath, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
@@ -706,10 +744,15 @@ function parseTranscript(transcriptPath) {
       totalCacheCreationTokens: 0,
       turnCount: 0,
       toolsUsed: [],
-      hasThinking: false
+      hasThinking: false,
+      lastTurnTextBlocks: [],
+      llmCallPhases: []
     };
     const toolNames = /* @__PURE__ */ new Set();
     let lastUsage;
+    let currentTurnTextBlocks = [];
+    let currentPhases = [];
+    let activePhase;
     for (const line of lines) {
       let entry;
       try {
@@ -732,6 +775,15 @@ function parseTranscript(transcriptPath) {
         }
         continue;
       }
+      if (isTopLevelUserPrompt(entry)) {
+        currentTurnTextBlocks = [];
+        finalizePhase2();
+        currentPhases = [];
+      }
+      if (isToolResultUserEntry2(entry)) {
+        finalizePhase2();
+        continue;
+      }
       if (entry.type !== "assistant") continue;
       const msg = entry.message;
       if (!msg) continue;
@@ -761,23 +813,55 @@ function parseTranscript(transcriptPath) {
         }
         lastUsage = u;
       }
+      const phase = ensurePhase2();
+      const entryTimestamp = typeof entry["timestamp"] === "string" ? entry["timestamp"] : void 0;
+      if (entryTimestamp) {
+        if (!phase.startTimestamp) phase.startTimestamp = entryTimestamp;
+        phase.endTimestamp = entryTimestamp;
+      }
+      if (msg.model) phase.model = msg.model;
+      if (msg.usage) {
+        phase.inputTokens += (_f = msg.usage.input_tokens) != null ? _f : 0;
+        phase.outputTokens += (_g = msg.usage.output_tokens) != null ? _g : 0;
+        phase.cacheReadTokens += (_h = msg.usage.cache_read_input_tokens) != null ? _h : 0;
+      }
       if (Array.isArray(msg.content)) {
         for (const block of msg.content) {
           if (block.type === "tool_use" && block.name) {
             toolNames.add(block.name);
+            phase.toolCalls.push({
+              id: block.id,
+              name: block.name,
+              input: block.input
+            });
           }
           if (block.type === "thinking") {
             summary.hasThinking = true;
+            phase.hasThinking = true;
+          }
+          if (block.type === "text" && typeof block.text === "string" && block.text.trim()) {
+            currentTurnTextBlocks.push(block.text);
+            if (phase.text) {
+              phase.text += "\n" + block.text;
+            } else {
+              phase.text = block.text;
+            }
           }
         }
+        summary.lastTurnTextBlocks = [...currentTurnTextBlocks];
       }
     }
+    finalizePhase2();
     if (lastUsage) {
       summary.lastTurnInputTokens = lastUsage.input_tokens;
       summary.lastTurnOutputTokens = lastUsage.output_tokens;
       summary.lastTurnCacheReadTokens = lastUsage.cache_read_input_tokens;
     }
     summary.toolsUsed = [...toolNames].sort();
+    if (summary.lastTurnTextBlocks.length > 0) {
+      summary.lastTurnFullOutput = summary.lastTurnTextBlocks.join("\n\n");
+    }
+    summary.llmCallPhases = currentPhases;
     return summary;
   } catch (e) {
     return void 0;
@@ -926,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,
@@ -940,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":
@@ -956,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
       });
@@ -977,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}`);
@@ -1130,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,
@@ -1328,8 +1413,18 @@ function readAppendSystemPrompt(sessionId) {
     return void 0;
   }
 }
+function isoToNanoString(iso, fallback) {
+  if (!iso) return fallback;
+  try {
+    const ms = new Date(iso).getTime();
+    if (!Number.isFinite(ms)) return fallback;
+    return String(ms) + "000000";
+  } catch (e) {
+    return fallback;
+  }
+}
 function enrichFromTranscript(payload, eventId, traceShipper) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (!payload.transcript_path) {
     return { summary: void 0, props: {} };
   }
@@ -1337,42 +1432,94 @@ function enrichFromTranscript(payload, eventId, traceShipper) {
     const summary = parseTranscript(payload.transcript_path);
     if (!summary) return { summary: void 0, props: {} };
     const props = transcriptToProperties(summary);
-    const spanInputTokens = (_a = summary.lastTurnInputTokens) != null ? _a : summary.totalInputTokens;
-    const spanOutputTokens = (_b = summary.lastTurnOutputTokens) != null ? _b : summary.totalOutputTokens;
-    if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
-      const parent = getParentContext(payload);
-      const now = nowUnixNanoString();
-      traceShipper.createSpan({
-        name: summary.model,
-        eventId,
-        parent,
-        startTimeUnixNano: now,
-        endTimeUnixNano: now,
-        attributes: [
-          attrString("ai.operationId", "generateText"),
-          attrString("gen_ai.response.model", summary.model),
-          attrString("gen_ai.system", "anthropic"),
-          attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
-          attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
-          ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
-        ]
-      });
+    const parent = getParentContext(payload);
+    if (summary.llmCallPhases.length > 0) {
+      let emittedPhaseIndex = 0;
+      for (let i = 0; i < summary.llmCallPhases.length; i++) {
+        const phase = summary.llmCallPhases[i];
+        const outputText = phase.text.trim();
+        if (!outputText) {
+          continue;
+        }
+        const model = (_b = (_a = phase.model) != null ? _a : summary.model) != null ? _b : "claude";
+        const now = nowUnixNanoString();
+        const startNano = isoToNanoString(phase.startTimestamp, now);
+        const endNano = isoToNanoString(phase.endTimestamp, startNano);
+        const toolCallNames = phase.toolCalls.map((tc) => tc.name).join(", ");
+        traceShipper.createSpan({
+          name: model,
+          eventId,
+          parent,
+          startTimeUnixNano: startNano,
+          endTimeUnixNano: endNano,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", phase.inputTokens),
+            attrInt("gen_ai.usage.completion_tokens", phase.outputTokens),
+            ...phase.cacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", phase.cacheReadTokens)] : [],
+            attrString("ai.response.text", outputText),
+            ...toolCallNames ? [attrString("ai.toolCall.names", toolCallNames)] : [],
+            ...phase.hasThinking ? [attrString("ai.has_thinking", "true")] : [],
+            attrInt("ai.llm_call.index", emittedPhaseIndex)
+          ]
+        });
+        emittedPhaseIndex++;
+      }
+    } else {
+      const spanInputTokens = (_c = summary.lastTurnInputTokens) != null ? _c : summary.totalInputTokens;
+      const spanOutputTokens = (_d = summary.lastTurnOutputTokens) != null ? _d : summary.totalOutputTokens;
+      if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
+        const now = nowUnixNanoString();
+        traceShipper.createSpan({
+          name: summary.model,
+          eventId,
+          parent,
+          startTimeUnixNano: now,
+          endTimeUnixNano: now,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", summary.model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
+            attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
+            ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
+          ]
+        });
+      }
     }
     return { summary, props };
   } catch (e) {
     return { summary: void 0, props: {} };
   }
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+function normalizeAssistantText(value) {
+  return value.trim().replace(/\r\n/g, "\n");
+}
+function buildStopOutput(summary, lastAssistantMessage) {
+  const finalMessage = typeof lastAssistantMessage === "string" ? normalizeAssistantText(lastAssistantMessage) : void 0;
+  if (!summary) return finalMessage;
+  const transcriptBlocks = summary.lastTurnTextBlocks.map(normalizeAssistantText).filter(Boolean);
+  if (finalMessage && !transcriptBlocks.includes(finalMessage)) {
+    transcriptBlocks.push(finalMessage);
+  }
+  if (transcriptBlocks.length > 0) {
+    return transcriptBlocks.join("\n\n");
+  }
+  return finalMessage;
+}
+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);
+  const output = buildStopOutput(summary, payload.last_assistant_message);
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
-    output: payload.last_assistant_message,
+    output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
     properties: {
       ...properties,
@@ -1383,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,
@@ -1401,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)) {
@@ -1442,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
   };
@@ -1617,6 +1766,7 @@ async function handleHook() {
   }
   const mapperConfig = {
     userId: config.userId,
+    convoId: config.convoId,
     debug: config.debug,
     eventName: config.eventName,
     customProperties: config.customProperties
@@ -2348,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

@@ -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.7";
+var PACKAGE_VERSION = "0.0.8";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -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
   };
@@ -806,9 +807,47 @@ var import_node_path2 = require("path");
 
 // src/transcript.ts
 var import_node_fs2 = require("fs");
+function isToolResultContentBlock(value) {
+  return Boolean(
+    value && typeof value === "object" && "type" in value && value["type"] === "tool_result"
+  );
+}
+function isTopLevelUserPrompt(entry) {
+  var _a;
+  if (entry.type !== "user") return false;
+  const content = (_a = entry.message) == null ? void 0 : _a.content;
+  if (typeof content === "string") return true;
+  if (!Array.isArray(content)) return false;
+  return content.some((block) => !isToolResultContentBlock(block));
+}
 function parseTranscript(transcriptPath) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   try {
+    let finalizePhase2 = function() {
+      if (activePhase && (activePhase.text || activePhase.toolCalls.length > 0)) {
+        currentPhases.push(activePhase);
+      }
+      activePhase = void 0;
+    }, ensurePhase2 = function() {
+      if (!activePhase) {
+        activePhase = {
+          text: "",
+          toolCalls: [],
+          inputTokens: 0,
+          outputTokens: 0,
+          cacheReadTokens: 0,
+          hasThinking: false
+        };
+      }
+      return activePhase;
+    }, isToolResultUserEntry2 = function(entry) {
+      var _a2;
+      if (entry.type !== "user") return false;
+      const content2 = (_a2 = entry.message) == null ? void 0 : _a2.content;
+      if (!Array.isArray(content2)) return false;
+      return content2.length > 0 && content2.every((b) => isToolResultContentBlock(b));
+    };
+    var finalizePhase = finalizePhase2, ensurePhase = ensurePhase2, isToolResultUserEntry = isToolResultUserEntry2;
     if (!(0, import_node_fs2.existsSync)(transcriptPath)) return void 0;
     const content = (0, import_node_fs2.readFileSync)(transcriptPath, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
@@ -819,10 +858,15 @@ function parseTranscript(transcriptPath) {
       totalCacheCreationTokens: 0,
       turnCount: 0,
       toolsUsed: [],
-      hasThinking: false
+      hasThinking: false,
+      lastTurnTextBlocks: [],
+      llmCallPhases: []
     };
     const toolNames = /* @__PURE__ */ new Set();
     let lastUsage;
+    let currentTurnTextBlocks = [];
+    let currentPhases = [];
+    let activePhase;
     for (const line of lines) {
       let entry;
       try {
@@ -845,6 +889,15 @@ function parseTranscript(transcriptPath) {
         }
         continue;
       }
+      if (isTopLevelUserPrompt(entry)) {
+        currentTurnTextBlocks = [];
+        finalizePhase2();
+        currentPhases = [];
+      }
+      if (isToolResultUserEntry2(entry)) {
+        finalizePhase2();
+        continue;
+      }
       if (entry.type !== "assistant") continue;
       const msg = entry.message;
       if (!msg) continue;
@@ -874,23 +927,55 @@ function parseTranscript(transcriptPath) {
         }
         lastUsage = u;
       }
+      const phase = ensurePhase2();
+      const entryTimestamp = typeof entry["timestamp"] === "string" ? entry["timestamp"] : void 0;
+      if (entryTimestamp) {
+        if (!phase.startTimestamp) phase.startTimestamp = entryTimestamp;
+        phase.endTimestamp = entryTimestamp;
+      }
+      if (msg.model) phase.model = msg.model;
+      if (msg.usage) {
+        phase.inputTokens += (_f = msg.usage.input_tokens) != null ? _f : 0;
+        phase.outputTokens += (_g = msg.usage.output_tokens) != null ? _g : 0;
+        phase.cacheReadTokens += (_h = msg.usage.cache_read_input_tokens) != null ? _h : 0;
+      }
       if (Array.isArray(msg.content)) {
         for (const block of msg.content) {
           if (block.type === "tool_use" && block.name) {
             toolNames.add(block.name);
+            phase.toolCalls.push({
+              id: block.id,
+              name: block.name,
+              input: block.input
+            });
           }
           if (block.type === "thinking") {
             summary.hasThinking = true;
+            phase.hasThinking = true;
+          }
+          if (block.type === "text" && typeof block.text === "string" && block.text.trim()) {
+            currentTurnTextBlocks.push(block.text);
+            if (phase.text) {
+              phase.text += "\n" + block.text;
+            } else {
+              phase.text = block.text;
+            }
           }
         }
+        summary.lastTurnTextBlocks = [...currentTurnTextBlocks];
       }
     }
+    finalizePhase2();
     if (lastUsage) {
       summary.lastTurnInputTokens = lastUsage.input_tokens;
       summary.lastTurnOutputTokens = lastUsage.output_tokens;
       summary.lastTurnCacheReadTokens = lastUsage.cache_read_input_tokens;
     }
     summary.toolsUsed = [...toolNames].sort();
+    if (summary.lastTurnTextBlocks.length > 0) {
+      summary.lastTurnFullOutput = summary.lastTurnTextBlocks.join("\n\n");
+    }
+    summary.llmCallPhases = currentPhases;
     return summary;
   } catch (e) {
     return void 0;
@@ -1039,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,
@@ -1053,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":
@@ -1069,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
       });
@@ -1090,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}`);
@@ -1243,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,
@@ -1441,8 +1527,18 @@ function readAppendSystemPrompt(sessionId) {
     return void 0;
   }
 }
+function isoToNanoString(iso, fallback) {
+  if (!iso) return fallback;
+  try {
+    const ms = new Date(iso).getTime();
+    if (!Number.isFinite(ms)) return fallback;
+    return String(ms) + "000000";
+  } catch (e) {
+    return fallback;
+  }
+}
 function enrichFromTranscript(payload, eventId, traceShipper) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (!payload.transcript_path) {
     return { summary: void 0, props: {} };
   }
@@ -1450,42 +1546,94 @@ function enrichFromTranscript(payload, eventId, traceShipper) {
     const summary = parseTranscript(payload.transcript_path);
     if (!summary) return { summary: void 0, props: {} };
     const props = transcriptToProperties(summary);
-    const spanInputTokens = (_a = summary.lastTurnInputTokens) != null ? _a : summary.totalInputTokens;
-    const spanOutputTokens = (_b = summary.lastTurnOutputTokens) != null ? _b : summary.totalOutputTokens;
-    if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
-      const parent = getParentContext(payload);
-      const now = nowUnixNanoString();
-      traceShipper.createSpan({
-        name: summary.model,
-        eventId,
-        parent,
-        startTimeUnixNano: now,
-        endTimeUnixNano: now,
-        attributes: [
-          attrString("ai.operationId", "generateText"),
-          attrString("gen_ai.response.model", summary.model),
-          attrString("gen_ai.system", "anthropic"),
-          attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
-          attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
-          ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
-        ]
-      });
+    const parent = getParentContext(payload);
+    if (summary.llmCallPhases.length > 0) {
+      let emittedPhaseIndex = 0;
+      for (let i = 0; i < summary.llmCallPhases.length; i++) {
+        const phase = summary.llmCallPhases[i];
+        const outputText = phase.text.trim();
+        if (!outputText) {
+          continue;
+        }
+        const model = (_b = (_a = phase.model) != null ? _a : summary.model) != null ? _b : "claude";
+        const now = nowUnixNanoString();
+        const startNano = isoToNanoString(phase.startTimestamp, now);
+        const endNano = isoToNanoString(phase.endTimestamp, startNano);
+        const toolCallNames = phase.toolCalls.map((tc) => tc.name).join(", ");
+        traceShipper.createSpan({
+          name: model,
+          eventId,
+          parent,
+          startTimeUnixNano: startNano,
+          endTimeUnixNano: endNano,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", phase.inputTokens),
+            attrInt("gen_ai.usage.completion_tokens", phase.outputTokens),
+            ...phase.cacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", phase.cacheReadTokens)] : [],
+            attrString("ai.response.text", outputText),
+            ...toolCallNames ? [attrString("ai.toolCall.names", toolCallNames)] : [],
+            ...phase.hasThinking ? [attrString("ai.has_thinking", "true")] : [],
+            attrInt("ai.llm_call.index", emittedPhaseIndex)
+          ]
+        });
+        emittedPhaseIndex++;
+      }
+    } else {
+      const spanInputTokens = (_c = summary.lastTurnInputTokens) != null ? _c : summary.totalInputTokens;
+      const spanOutputTokens = (_d = summary.lastTurnOutputTokens) != null ? _d : summary.totalOutputTokens;
+      if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
+        const now = nowUnixNanoString();
+        traceShipper.createSpan({
+          name: summary.model,
+          eventId,
+          parent,
+          startTimeUnixNano: now,
+          endTimeUnixNano: now,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", summary.model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
+            attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
+            ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
+          ]
+        });
+      }
     }
     return { summary, props };
   } catch (e) {
     return { summary: void 0, props: {} };
   }
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+function normalizeAssistantText(value) {
+  return value.trim().replace(/\r\n/g, "\n");
+}
+function buildStopOutput(summary, lastAssistantMessage) {
+  const finalMessage = typeof lastAssistantMessage === "string" ? normalizeAssistantText(lastAssistantMessage) : void 0;
+  if (!summary) return finalMessage;
+  const transcriptBlocks = summary.lastTurnTextBlocks.map(normalizeAssistantText).filter(Boolean);
+  if (finalMessage && !transcriptBlocks.includes(finalMessage)) {
+    transcriptBlocks.push(finalMessage);
+  }
+  if (transcriptBlocks.length > 0) {
+    return transcriptBlocks.join("\n\n");
+  }
+  return finalMessage;
+}
+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);
+  const output = buildStopOutput(summary, payload.last_assistant_message);
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
-    output: payload.last_assistant_message,
+    output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
     properties: {
       ...properties,
@@ -1496,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>;
@@ -308,8 +310,37 @@ 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.7";
+declare const PACKAGE_VERSION = "0.0.8";
 
+/** A tool call extracted from an assistant message content block. */
+interface LLMToolCall {
+    id?: string;
+    name: string;
+    input?: Record<string, unknown>;
+}
+/**
+ * One LLM-call phase within a turn.
+ * A phase = one or more contiguous assistant messages before the next
+ * tool-result user entry resets the context.
+ */
+interface LLMCallPhase {
+    /** Concatenated assistant text blocks in this phase */
+    text: string;
+    /** Tool calls the model decided to make in this phase */
+    toolCalls: LLMToolCall[];
+    /** Model that produced this phase */
+    model?: string;
+    /** Token usage accumulated across assistant messages in this phase */
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens: number;
+    /** Whether a thinking block appeared in this phase */
+    hasThinking: boolean;
+    /** ISO timestamp of the first assistant message in the phase */
+    startTimestamp?: string;
+    /** ISO timestamp of the last assistant message in the phase */
+    endTimestamp?: string;
+}
 interface TranscriptSummary {
     /** Aggregated token usage across all turns */
     totalInputTokens: number;
@@ -338,6 +369,12 @@ interface TranscriptSummary {
     gitBranch?: string;
     /** Whether thinking/reasoning content was used */
     hasThinking: boolean;
+    /** Ordered assistant text blocks for the latest top-level user turn */
+    lastTurnTextBlocks: string[];
+    /** Combined assistant text for the latest top-level user turn */
+    lastTurnFullOutput?: string;
+    /** Ordered LLM-call phases for the latest top-level user turn */
+    llmCallPhases: LLMCallPhase[];
 }
 /**
  * Parse a Claude Code transcript JSONL file and extract a summary.
@@ -425,4 +462,4 @@ declare const TOOL_SCHEMA: {
 };
 declare function startMcpServer(): Promise<void>;
 
-export { DEFAULT_CATEGORY_KEYS, EventShipper, type HookPayload, type LocalDebuggerResult, type MapperConfig, PACKAGE_NAME, PACKAGE_VERSION, type RaindropConfig, type SelfDiagnosticsConfig, type SelfDiagnosticsSignalDef, type SetupScope, TOOL_SCHEMA, TraceShipper, type TranscriptSummary, detectLocalDebugger, executeTool, extractAppendSystemPrompt, getConfigPath, loadConfig, mapHookToRaindrop, mirrorEventToLocalDebugger, normalizeSignals, parseTranscript, resolveCurrentEventId, resolveToolConfig, startMcpServer, transcriptToProperties, updateConfig };
+export { DEFAULT_CATEGORY_KEYS, EventShipper, type HookPayload, type LLMCallPhase, type LLMToolCall, type LocalDebuggerResult, type MapperConfig, PACKAGE_NAME, PACKAGE_VERSION, type RaindropConfig, type SelfDiagnosticsConfig, type SelfDiagnosticsSignalDef, type SetupScope, TOOL_SCHEMA, TraceShipper, type TranscriptSummary, detectLocalDebugger, executeTool, extractAppendSystemPrompt, getConfigPath, loadConfig, mapHookToRaindrop, mirrorEventToLocalDebugger, normalizeSignals, parseTranscript, resolveCurrentEventId, resolveToolConfig, startMcpServer, transcriptToProperties, updateConfig };

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,8 +310,37 @@ 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.7";
+declare const PACKAGE_VERSION = "0.0.8";
 
+/** A tool call extracted from an assistant message content block. */
+interface LLMToolCall {
+    id?: string;
+    name: string;
+    input?: Record<string, unknown>;
+}
+/**
+ * One LLM-call phase within a turn.
+ * A phase = one or more contiguous assistant messages before the next
+ * tool-result user entry resets the context.
+ */
+interface LLMCallPhase {
+    /** Concatenated assistant text blocks in this phase */
+    text: string;
+    /** Tool calls the model decided to make in this phase */
+    toolCalls: LLMToolCall[];
+    /** Model that produced this phase */
+    model?: string;
+    /** Token usage accumulated across assistant messages in this phase */
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadTokens: number;
+    /** Whether a thinking block appeared in this phase */
+    hasThinking: boolean;
+    /** ISO timestamp of the first assistant message in the phase */
+    startTimestamp?: string;
+    /** ISO timestamp of the last assistant message in the phase */
+    endTimestamp?: string;
+}
 interface TranscriptSummary {
     /** Aggregated token usage across all turns */
     totalInputTokens: number;
@@ -338,6 +369,12 @@ interface TranscriptSummary {
     gitBranch?: string;
     /** Whether thinking/reasoning content was used */
     hasThinking: boolean;
+    /** Ordered assistant text blocks for the latest top-level user turn */
+    lastTurnTextBlocks: string[];
+    /** Combined assistant text for the latest top-level user turn */
+    lastTurnFullOutput?: string;
+    /** Ordered LLM-call phases for the latest top-level user turn */
+    llmCallPhases: LLMCallPhase[];
 }
 /**
  * Parse a Claude Code transcript JSONL file and extract a summary.
@@ -425,4 +462,4 @@ declare const TOOL_SCHEMA: {
 };
 declare function startMcpServer(): Promise<void>;
 
-export { DEFAULT_CATEGORY_KEYS, EventShipper, type HookPayload, type LocalDebuggerResult, type MapperConfig, PACKAGE_NAME, PACKAGE_VERSION, type RaindropConfig, type SelfDiagnosticsConfig, type SelfDiagnosticsSignalDef, type SetupScope, TOOL_SCHEMA, TraceShipper, type TranscriptSummary, detectLocalDebugger, executeTool, extractAppendSystemPrompt, getConfigPath, loadConfig, mapHookToRaindrop, mirrorEventToLocalDebugger, normalizeSignals, parseTranscript, resolveCurrentEventId, resolveToolConfig, startMcpServer, transcriptToProperties, updateConfig };
+export { DEFAULT_CATEGORY_KEYS, EventShipper, type HookPayload, type LLMCallPhase, type LLMToolCall, type LocalDebuggerResult, type MapperConfig, PACKAGE_NAME, PACKAGE_VERSION, type RaindropConfig, type SelfDiagnosticsConfig, type SelfDiagnosticsSignalDef, type SetupScope, TOOL_SCHEMA, TraceShipper, type TranscriptSummary, detectLocalDebugger, executeTool, extractAppendSystemPrompt, getConfigPath, loadConfig, mapHookToRaindrop, mirrorEventToLocalDebugger, normalizeSignals, parseTranscript, resolveCurrentEventId, resolveToolConfig, startMcpServer, transcriptToProperties, updateConfig };

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.7";
+var PACKAGE_VERSION = "0.0.8";
 
 // src/shipper.ts
 var EventShipper2 = class extends EventShipper {
@@ -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
   };
@@ -761,9 +762,47 @@ import { join as join2 } from "path";
 
 // src/transcript.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+function isToolResultContentBlock(value) {
+  return Boolean(
+    value && typeof value === "object" && "type" in value && value["type"] === "tool_result"
+  );
+}
+function isTopLevelUserPrompt(entry) {
+  var _a;
+  if (entry.type !== "user") return false;
+  const content = (_a = entry.message) == null ? void 0 : _a.content;
+  if (typeof content === "string") return true;
+  if (!Array.isArray(content)) return false;
+  return content.some((block) => !isToolResultContentBlock(block));
+}
 function parseTranscript(transcriptPath) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   try {
+    let finalizePhase2 = function() {
+      if (activePhase && (activePhase.text || activePhase.toolCalls.length > 0)) {
+        currentPhases.push(activePhase);
+      }
+      activePhase = void 0;
+    }, ensurePhase2 = function() {
+      if (!activePhase) {
+        activePhase = {
+          text: "",
+          toolCalls: [],
+          inputTokens: 0,
+          outputTokens: 0,
+          cacheReadTokens: 0,
+          hasThinking: false
+        };
+      }
+      return activePhase;
+    }, isToolResultUserEntry2 = function(entry) {
+      var _a2;
+      if (entry.type !== "user") return false;
+      const content2 = (_a2 = entry.message) == null ? void 0 : _a2.content;
+      if (!Array.isArray(content2)) return false;
+      return content2.length > 0 && content2.every((b) => isToolResultContentBlock(b));
+    };
+    var finalizePhase = finalizePhase2, ensurePhase = ensurePhase2, isToolResultUserEntry = isToolResultUserEntry2;
     if (!existsSync2(transcriptPath)) return void 0;
     const content = readFileSync2(transcriptPath, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
@@ -774,10 +813,15 @@ function parseTranscript(transcriptPath) {
       totalCacheCreationTokens: 0,
       turnCount: 0,
       toolsUsed: [],
-      hasThinking: false
+      hasThinking: false,
+      lastTurnTextBlocks: [],
+      llmCallPhases: []
     };
     const toolNames = /* @__PURE__ */ new Set();
     let lastUsage;
+    let currentTurnTextBlocks = [];
+    let currentPhases = [];
+    let activePhase;
     for (const line of lines) {
       let entry;
       try {
@@ -800,6 +844,15 @@ function parseTranscript(transcriptPath) {
         }
         continue;
       }
+      if (isTopLevelUserPrompt(entry)) {
+        currentTurnTextBlocks = [];
+        finalizePhase2();
+        currentPhases = [];
+      }
+      if (isToolResultUserEntry2(entry)) {
+        finalizePhase2();
+        continue;
+      }
       if (entry.type !== "assistant") continue;
       const msg = entry.message;
       if (!msg) continue;
@@ -829,23 +882,55 @@ function parseTranscript(transcriptPath) {
         }
         lastUsage = u;
       }
+      const phase = ensurePhase2();
+      const entryTimestamp = typeof entry["timestamp"] === "string" ? entry["timestamp"] : void 0;
+      if (entryTimestamp) {
+        if (!phase.startTimestamp) phase.startTimestamp = entryTimestamp;
+        phase.endTimestamp = entryTimestamp;
+      }
+      if (msg.model) phase.model = msg.model;
+      if (msg.usage) {
+        phase.inputTokens += (_f = msg.usage.input_tokens) != null ? _f : 0;
+        phase.outputTokens += (_g = msg.usage.output_tokens) != null ? _g : 0;
+        phase.cacheReadTokens += (_h = msg.usage.cache_read_input_tokens) != null ? _h : 0;
+      }
       if (Array.isArray(msg.content)) {
         for (const block of msg.content) {
           if (block.type === "tool_use" && block.name) {
             toolNames.add(block.name);
+            phase.toolCalls.push({
+              id: block.id,
+              name: block.name,
+              input: block.input
+            });
           }
           if (block.type === "thinking") {
             summary.hasThinking = true;
+            phase.hasThinking = true;
+          }
+          if (block.type === "text" && typeof block.text === "string" && block.text.trim()) {
+            currentTurnTextBlocks.push(block.text);
+            if (phase.text) {
+              phase.text += "\n" + block.text;
+            } else {
+              phase.text = block.text;
+            }
           }
         }
+        summary.lastTurnTextBlocks = [...currentTurnTextBlocks];
       }
     }
+    finalizePhase2();
     if (lastUsage) {
       summary.lastTurnInputTokens = lastUsage.input_tokens;
       summary.lastTurnOutputTokens = lastUsage.output_tokens;
       summary.lastTurnCacheReadTokens = lastUsage.cache_read_input_tokens;
     }
     summary.toolsUsed = [...toolNames].sort();
+    if (summary.lastTurnTextBlocks.length > 0) {
+      summary.lastTurnFullOutput = summary.lastTurnTextBlocks.join("\n\n");
+    }
+    summary.llmCallPhases = currentPhases;
     return summary;
   } catch (e) {
     return void 0;
@@ -994,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,
@@ -1008,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":
@@ -1024,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
       });
@@ -1045,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}`);
@@ -1198,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,
@@ -1396,8 +1482,18 @@ function readAppendSystemPrompt(sessionId) {
     return void 0;
   }
 }
+function isoToNanoString(iso, fallback) {
+  if (!iso) return fallback;
+  try {
+    const ms = new Date(iso).getTime();
+    if (!Number.isFinite(ms)) return fallback;
+    return String(ms) + "000000";
+  } catch (e) {
+    return fallback;
+  }
+}
 function enrichFromTranscript(payload, eventId, traceShipper) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (!payload.transcript_path) {
     return { summary: void 0, props: {} };
   }
@@ -1405,42 +1501,94 @@ function enrichFromTranscript(payload, eventId, traceShipper) {
     const summary = parseTranscript(payload.transcript_path);
     if (!summary) return { summary: void 0, props: {} };
     const props = transcriptToProperties(summary);
-    const spanInputTokens = (_a = summary.lastTurnInputTokens) != null ? _a : summary.totalInputTokens;
-    const spanOutputTokens = (_b = summary.lastTurnOutputTokens) != null ? _b : summary.totalOutputTokens;
-    if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
-      const parent = getParentContext(payload);
-      const now = nowUnixNanoString();
-      traceShipper.createSpan({
-        name: summary.model,
-        eventId,
-        parent,
-        startTimeUnixNano: now,
-        endTimeUnixNano: now,
-        attributes: [
-          attrString("ai.operationId", "generateText"),
-          attrString("gen_ai.response.model", summary.model),
-          attrString("gen_ai.system", "anthropic"),
-          attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
-          attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
-          ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
-        ]
-      });
+    const parent = getParentContext(payload);
+    if (summary.llmCallPhases.length > 0) {
+      let emittedPhaseIndex = 0;
+      for (let i = 0; i < summary.llmCallPhases.length; i++) {
+        const phase = summary.llmCallPhases[i];
+        const outputText = phase.text.trim();
+        if (!outputText) {
+          continue;
+        }
+        const model = (_b = (_a = phase.model) != null ? _a : summary.model) != null ? _b : "claude";
+        const now = nowUnixNanoString();
+        const startNano = isoToNanoString(phase.startTimestamp, now);
+        const endNano = isoToNanoString(phase.endTimestamp, startNano);
+        const toolCallNames = phase.toolCalls.map((tc) => tc.name).join(", ");
+        traceShipper.createSpan({
+          name: model,
+          eventId,
+          parent,
+          startTimeUnixNano: startNano,
+          endTimeUnixNano: endNano,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", phase.inputTokens),
+            attrInt("gen_ai.usage.completion_tokens", phase.outputTokens),
+            ...phase.cacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", phase.cacheReadTokens)] : [],
+            attrString("ai.response.text", outputText),
+            ...toolCallNames ? [attrString("ai.toolCall.names", toolCallNames)] : [],
+            ...phase.hasThinking ? [attrString("ai.has_thinking", "true")] : [],
+            attrInt("ai.llm_call.index", emittedPhaseIndex)
+          ]
+        });
+        emittedPhaseIndex++;
+      }
+    } else {
+      const spanInputTokens = (_c = summary.lastTurnInputTokens) != null ? _c : summary.totalInputTokens;
+      const spanOutputTokens = (_d = summary.lastTurnOutputTokens) != null ? _d : summary.totalOutputTokens;
+      if (summary.model && (spanInputTokens > 0 || spanOutputTokens > 0)) {
+        const now = nowUnixNanoString();
+        traceShipper.createSpan({
+          name: summary.model,
+          eventId,
+          parent,
+          startTimeUnixNano: now,
+          endTimeUnixNano: now,
+          attributes: [
+            attrString("ai.operationId", "generateText"),
+            attrString("gen_ai.response.model", summary.model),
+            attrString("gen_ai.system", "anthropic"),
+            attrInt("gen_ai.usage.prompt_tokens", spanInputTokens),
+            attrInt("gen_ai.usage.completion_tokens", spanOutputTokens),
+            ...summary.lastTurnCacheReadTokens != null && summary.lastTurnCacheReadTokens > 0 ? [attrInt("gen_ai.usage.cache_read_tokens", summary.lastTurnCacheReadTokens)] : []
+          ]
+        });
+      }
     }
     return { summary, props };
   } catch (e) {
     return { summary: void 0, props: {} };
   }
 }
-async function handleStopOrFailure(payload, eventId, config, properties, eventShipper, traceShipper, extraProperties) {
+function normalizeAssistantText(value) {
+  return value.trim().replace(/\r\n/g, "\n");
+}
+function buildStopOutput(summary, lastAssistantMessage) {
+  const finalMessage = typeof lastAssistantMessage === "string" ? normalizeAssistantText(lastAssistantMessage) : void 0;
+  if (!summary) return finalMessage;
+  const transcriptBlocks = summary.lastTurnTextBlocks.map(normalizeAssistantText).filter(Boolean);
+  if (finalMessage && !transcriptBlocks.includes(finalMessage)) {
+    transcriptBlocks.push(finalMessage);
+  }
+  if (transcriptBlocks.length > 0) {
+    return transcriptBlocks.join("\n\n");
+  }
+  return finalMessage;
+}
+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);
+  const output = buildStopOutput(summary, payload.last_assistant_message);
   await eventShipper.patch(eventId, {
     isPending: false,
     userId: config.userId,
-    convoId: payload.session_id,
+    convoId,
     eventName: config.eventName,
-    output: payload.last_assistant_message,
+    output,
     ...(summary == null ? void 0 : summary.model) ? { model: summary.model } : {},
     properties: {
       ...properties,
@@ -1451,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.7",
+  "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",