@respan/cli 0.6.8 → 0.7.0

package/dist/hooks/claude-code.cjs

@@ -340,7 +340,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]

package/dist/hooks/codex-cli.cjs

@@ -339,7 +339,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]

package/dist/hooks/gemini-cli.cjs

@@ -318,7 +318,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]
@@ -438,7 +438,7 @@ function detectModel(hookData) {
   const llmReq = hookData.llm_request ?? {};
   return String(llmReq.model ?? "") || "gemini-cli";
 }
-function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurns, toolDetails, thoughtsTokens) {
+function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurns, toolDetails, thoughtsTokens, textRounds, roundStartTimes) {
   const spans = [];
   const sessionId = String(hookData.session_id ?? "");
   const model = detectModel(hookData);
@@ -447,7 +447,6 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
   const beginTime = startTimeIso || endTime;
   const lat = latencySeconds(beginTime, endTime);
   const promptMessages = extractMessages(hookData);
-  const completionMessage = { role: "assistant", content: truncate(outputText, MAX_CHARS) };
   const { workflowName, spanName, customerId } = resolveSpanFields(config, {
     workflowName: "gemini-cli",
     spanName: "gemini-cli"
@@ -480,50 +479,85 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     metadata,
     ...lat !== void 0 ? { latency: lat } : {}
   });
-  const genSpan = {
-    trace_unique_id: traceUniqueId,
-    span_unique_id: `gcli_${safeId}_${turnTs}_gen`,
-    span_parent_id: rootSpanId,
-    span_name: "gemini.chat",
-    span_workflow_name: workflowName,
-    span_path: "gemini_chat",
-    model,
-    provider_id: "google",
-    metadata: {},
-    input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: truncate(outputText, MAX_CHARS),
-    timestamp: endTime,
-    start_time: beginTime,
-    prompt_tokens: tokens.prompt_tokens,
-    completion_tokens: tokens.completion_tokens,
-    total_tokens: tokens.total_tokens,
-    ...lat !== void 0 ? { latency: lat } : {}
-  };
-  if (reqConfig.temperature != null) genSpan.temperature = reqConfig.temperature;
-  if (reqConfig.maxOutputTokens != null) genSpan.max_tokens = reqConfig.maxOutputTokens;
-  spans.push(genSpan);
-  if (thoughtsTokens > 0) {
-    spans.push({
-      trace_unique_id: traceUniqueId,
-      span_unique_id: `gcli_${safeId}_${turnTs}_reasoning`,
-      span_parent_id: rootSpanId,
-      span_name: "Reasoning",
-      span_workflow_name: workflowName,
-      span_path: "reasoning",
-      provider_id: "",
-      metadata: { reasoning_tokens: thoughtsTokens },
-      input: "",
-      output: `[Reasoning: ${thoughtsTokens} tokens]`,
-      timestamp: endTime,
-      start_time: beginTime
-    });
+  const rounds = textRounds.length > 0 ? textRounds : [outputText];
+  const roundStarts = roundStartTimes.length > 0 ? roundStartTimes : [beginTime];
+  let toolIdx = 0;
+  for (let r = 0; r < rounds.length; r++) {
+    const roundText = rounds[r];
+    const roundStart = roundStarts[r] || beginTime;
+    const nextTool = toolIdx < toolDetails.length ? toolDetails[toolIdx] : null;
+    const roundEnd = r < rounds.length - 1 && nextTool?.start_time ? nextTool.start_time : endTime;
+    const roundLat = latencySeconds(roundStart, roundEnd);
+    if (roundText) {
+      const genSpan = {
+        trace_unique_id: traceUniqueId,
+        span_unique_id: `gcli_${safeId}_${turnTs}_gen_${r}`,
+        span_parent_id: rootSpanId,
+        span_name: "gemini.chat",
+        span_workflow_name: workflowName,
+        span_path: "gemini_chat",
+        model,
+        provider_id: "google",
+        metadata: {},
+        input: r === 0 && promptMessages.length ? JSON.stringify(promptMessages) : "",
+        output: truncate(roundText, MAX_CHARS),
+        timestamp: roundEnd,
+        start_time: roundStart,
+        ...roundLat !== void 0 ? { latency: roundLat } : {},
+        // Only attach tokens to the first round (aggregate usage from Gemini)
+        ...r === 0 ? {
+          prompt_tokens: tokens.prompt_tokens,
+          completion_tokens: tokens.completion_tokens,
+          total_tokens: tokens.total_tokens
+        } : {}
+      };
+      if (r === 0) {
+        if (reqConfig.temperature != null) genSpan.temperature = reqConfig.temperature;
+        if (reqConfig.maxOutputTokens != null) genSpan.max_tokens = reqConfig.maxOutputTokens;
+      }
+      spans.push(genSpan);
+    }
+    if (r < rounds.length - 1) {
+      while (toolIdx < toolDetails.length) {
+        const detail = toolDetails[toolIdx];
+        const toolName = detail?.name ?? "";
+        const toolArgs = detail?.args ?? detail?.input ?? {};
+        const toolOutput = detail?.output ?? "";
+        const displayName = toolName ? toolDisplayName(toolName) : `Call ${toolIdx + 1}`;
+        const toolInputStr = toolName ? formatToolInput(toolName, toolArgs) : "";
+        const toolMeta = {};
+        if (toolName) toolMeta.tool_name = toolName;
+        if (detail?.error) toolMeta.error = detail.error;
+        const toolStart = detail?.start_time ?? beginTime;
+        const toolEnd = detail?.end_time ?? endTime;
+        const toolLat = latencySeconds(toolStart, toolEnd);
+        spans.push({
+          trace_unique_id: traceUniqueId,
+          span_unique_id: `gcli_${safeId}_${turnTs}_tool_${toolIdx + 1}`,
+          span_parent_id: rootSpanId,
+          span_name: `Tool: ${displayName}`,
+          span_workflow_name: workflowName,
+          span_path: toolName ? `tool_${toolName}` : "tool_call",
+          provider_id: "",
+          metadata: toolMeta,
+          input: toolInputStr,
+          output: truncate(toolOutput, MAX_CHARS),
+          timestamp: toolEnd,
+          start_time: toolStart,
+          ...toolLat !== void 0 ? { latency: toolLat } : {}
+        });
+        toolIdx++;
+        const nextDetail = toolDetails[toolIdx];
+        if (nextDetail && roundStarts[r + 1] && nextDetail.start_time && nextDetail.start_time > roundStarts[r + 1]) break;
+      }
+    }
   }
-  for (let i = 0; i < toolTurns; i++) {
-    const detail = toolDetails[i] ?? null;
+  while (toolIdx < toolDetails.length) {
+    const detail = toolDetails[toolIdx];
     const toolName = detail?.name ?? "";
     const toolArgs = detail?.args ?? detail?.input ?? {};
     const toolOutput = detail?.output ?? "";
-    const displayName = toolName ? toolDisplayName(toolName) : `Call ${i + 1}`;
+    const displayName = toolName ? toolDisplayName(toolName) : `Call ${toolIdx + 1}`;
     const toolInputStr = toolName ? formatToolInput(toolName, toolArgs) : "";
     const toolMeta = {};
     if (toolName) toolMeta.tool_name = toolName;
@@ -533,7 +567,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     const toolLat = latencySeconds(toolStart, toolEnd);
     spans.push({
       trace_unique_id: traceUniqueId,
-      span_unique_id: `gcli_${safeId}_${turnTs}_tool_${i + 1}`,
+      span_unique_id: `gcli_${safeId}_${turnTs}_tool_${toolIdx + 1}`,
       span_parent_id: rootSpanId,
       span_name: `Tool: ${displayName}`,
       span_workflow_name: workflowName,
@@ -546,6 +580,23 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
       start_time: toolStart,
       ...toolLat !== void 0 ? { latency: toolLat } : {}
     });
+    toolIdx++;
+  }
+  if (thoughtsTokens > 0) {
+    spans.push({
+      trace_unique_id: traceUniqueId,
+      span_unique_id: `gcli_${safeId}_${turnTs}_reasoning`,
+      span_parent_id: rootSpanId,
+      span_name: "Reasoning",
+      span_workflow_name: workflowName,
+      span_path: "reasoning",
+      provider_id: "",
+      metadata: { reasoning_tokens: thoughtsTokens },
+      input: "",
+      output: `[Reasoning: ${thoughtsTokens} tokens]`,
+      timestamp: endTime,
+      start_time: beginTime
+    });
   }
   return addDefaultsToAll(spans);
 }
@@ -665,7 +716,6 @@ function processBeforeTool(hookData) {
   pending.push({ name: toolName, input: toolInput, start_time: nowISO() });
   state.pending_tools = pending;
   state.send_version = (state.send_version ?? 0) + 1;
-  state.tool_turns = (state.tool_turns ?? 0) + 1;
   saveStreamState(sessionId, state);
 }
 function processAfterTool(hookData) {
@@ -748,7 +798,8 @@ function processChunk(hookData) {
       state.tool_turns = (state.tool_turns ?? 0) + 1;
       state.send_version = (state.send_version ?? 0) + 1;
       toolCallDetected = true;
-      debug(`Tool call detected via msg_count (${savedMsgCount} \u2192 ${currentMsgCount}), tool_turns=${state.tool_turns}`);
+      state.current_round = (state.current_round ?? 0) + 1;
+      debug(`Tool call detected via msg_count (${savedMsgCount} \u2192 ${currentMsgCount}), tool_turns=${state.tool_turns}, round=${state.current_round}`);
     }
   }
   state.msg_count = currentMsgCount;
@@ -757,10 +808,15 @@ function processChunk(hookData) {
     state.accumulated_text += chunkText;
     state.last_tokens = completionTokens || state.last_tokens;
     if (thoughtsTokens > 0) state.thoughts_tokens = thoughtsTokens;
-  }
-  if (chunkText) {
+    const round = state.current_round ?? 0;
+    if (!state.text_rounds) state.text_rounds = [];
+    if (!state.round_start_times) state.round_start_times = [];
+    while (state.text_rounds.length <= round) state.text_rounds.push("");
+    while (state.round_start_times.length <= round) state.round_start_times.push("");
+    state.text_rounds[round] += chunkText;
+    if (!state.round_start_times[round]) state.round_start_times[round] = nowISO();
     saveStreamState(sessionId, state);
-    debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
+    debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}, round=${round}`);
   }
   const isToolTurn = hasToolCall || ["TOOL_CALLS", "FUNCTION_CALL", "TOOL_USE"].includes(finishReason);
   if (isToolTurn) {
@@ -800,7 +856,9 @@ function processChunk(hookData) {
     state.first_chunk_time || void 0,
     state.tool_turns ?? 0,
     state.tool_details ?? [],
-    state.thoughts_tokens ?? 0
+    state.thoughts_tokens ?? 0,
+    state.text_rounds ?? [],
+    state.round_start_times ?? []
   );
   if (isFinished && chunkText) {
     debug(`Immediate send (text+STOP, tool_turns=${state.tool_turns ?? 0}), ${state.accumulated_text.length} chars`);
@@ -814,35 +872,30 @@ function processChunk(hookData) {
   debug(`Delayed send (version=${state.send_version}, delay=${SEND_DELAY}s), ${state.accumulated_text.length} chars`);
   launchDelayedSend(sessionId, state.send_version, spans, creds.apiKey, creds.baseUrl);
 }
-function mainWorker(raw) {
+function processChunkInWorker(dataFile) {
   try {
+    const raw = fs2.readFileSync(dataFile, "utf-8");
+    fs2.unlinkSync(dataFile);
     if (!raw.trim()) return;
     const hookData = JSON.parse(raw);
-    const event = String(hookData.hook_event_name ?? "");
     const unlock = acquireLock(LOCK_PATH);
     try {
-      if (event === "BeforeTool") {
-        processBeforeTool(hookData);
-      } else if (event === "AfterTool") {
-        processAfterTool(hookData);
-      } else {
-        processChunk(hookData);
-      }
+      processChunk(hookData);
     } finally {
       unlock?.();
     }
   } catch (e) {
-    if (e instanceof SyntaxError) {
-      log("ERROR", `Invalid JSON from stdin: ${e}`);
-    } else {
-      log("ERROR", `Hook error: ${e}`);
+    log("ERROR", `Worker error: ${e}`);
+    try {
+      fs2.unlinkSync(dataFile);
+    } catch {
     }
   }
 }
 function main() {
   if (process.env._RESPAN_GEM_WORKER === "1") {
-    const raw2 = process.env._RESPAN_GEM_DATA ?? "";
-    mainWorker(raw2);
+    const dataFile = process.env._RESPAN_GEM_FILE ?? "";
+    if (dataFile) processChunkInWorker(dataFile);
     return;
   }
   let raw = "";
@@ -855,15 +908,34 @@ function main() {
     process.exit(0);
   }
   try {
-    const scriptPath = __filename || process.argv[1];
-    const child = (0, import_node_child_process.execFile)("node", [scriptPath], {
-      env: { ...process.env, _RESPAN_GEM_WORKER: "1", _RESPAN_GEM_DATA: raw },
-      stdio: "ignore",
-      detached: true
-    });
-    child.unref();
+    const hookData = JSON.parse(raw);
+    const event = String(hookData.hook_event_name ?? "");
+    if (event === "BeforeTool" || event === "AfterTool") {
+      const unlock = acquireLock(LOCK_PATH);
+      try {
+        if (event === "BeforeTool") processBeforeTool(hookData);
+        else processAfterTool(hookData);
+      } finally {
+        unlock?.();
+      }
+    } else {
+      const dataFile = path2.join(STATE_DIR, `respan_chunk_${process.pid}.json`);
+      fs2.mkdirSync(STATE_DIR, { recursive: true });
+      fs2.writeFileSync(dataFile, raw);
+      try {
+        const scriptPath = __filename || process.argv[1];
+        const child = (0, import_node_child_process.execFile)("node", [scriptPath], {
+          env: { ...process.env, _RESPAN_GEM_WORKER: "1", _RESPAN_GEM_FILE: dataFile },
+          stdio: "ignore",
+          detached: true
+        });
+        child.unref();
+      } catch (e) {
+        processChunkInWorker(dataFile);
+      }
+    }
   } catch (e) {
-    mainWorker(raw);
+    log("ERROR", `Hook error: ${e}`);
   }
   process.exit(0);
 }