@respan/cli 0.6.0 → 0.6.2

package/dist/hooks/claude-code.cjs

@@ -607,7 +607,7 @@ function createSpans(sessionId, turnNum, userMsg, assistantMsgs, toolResults, co
     provider_id: "",
     span_path: "",
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: completionMessage ? JSON.stringify(completionMessage) : "",
+    output: finalOutput,
     timestamp: timestampStr,
     start_time: startTimeStr,
     metadata,
@@ -627,7 +627,7 @@ function createSpans(sessionId, turnNum, userMsg, assistantMsgs, toolResults, co
     provider_id: "anthropic",
     metadata: {},
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: completionMessage ? JSON.stringify(completionMessage) : "",
+    output: finalOutput,
     prompt_messages: promptMessages,
     completion_message: completionMessage,
     timestamp: genEnd,

package/dist/hooks/claude-code.js

@@ -256,7 +256,7 @@ function createSpans(sessionId, turnNum, userMsg, assistantMsgs, toolResults, co
         provider_id: '',
         span_path: '',
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: completionMessage ? JSON.stringify(completionMessage) : '',
+        output: finalOutput,
         timestamp: timestampStr,
         start_time: startTimeStr,
         metadata,
@@ -277,7 +277,7 @@ function createSpans(sessionId, turnNum, userMsg, assistantMsgs, toolResults, co
         provider_id: 'anthropic',
         metadata: {},
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: completionMessage ? JSON.stringify(completionMessage) : '',
+        output: finalOutput,
         prompt_messages: promptMessages,
         completion_message: completionMessage,
         timestamp: genEnd,

package/dist/hooks/codex-cli.cjs

@@ -475,6 +475,7 @@ function extractTurns(events) {
           tool_calls: [],
           tool_outputs: [],
           reasoning: false,
+          reasoning_text: "",
           token_usage: {}
         };
       } else if (msgType === "task_complete" && current) {
@@ -512,13 +513,23 @@ function extractTurns(events) {
           timestamp
         });
       } else if (itemType === "reasoning") {
-        if (current) current.reasoning = true;
+        if (current) {
+          current.reasoning = true;
+          const summary = String(payload.summary ?? payload.text ?? "");
+          if (summary) current.reasoning_text += (current.reasoning_text ? "\n" : "") + summary;
+        }
       } else if (itemType === "web_search_call") {
         const action = payload.action ?? {};
+        const syntheticId = `web_search_${timestamp}`;
         current.tool_calls.push({
           name: "web_search",
           arguments: JSON.stringify({ query: action.query ?? "" }),
-          call_id: `web_search_${timestamp}`,
+          call_id: syntheticId,
+          timestamp
+        });
+        current.tool_outputs.push({
+          call_id: syntheticId,
+          output: `Search: ${action.query ?? ""}`,
           timestamp
         });
       }
@@ -570,7 +581,7 @@ function createSpans(sessionId, turnNum, turn, config) {
     provider_id: "",
     span_path: "",
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: completionMessage ? JSON.stringify(completionMessage) : "",
+    output: turn.assistant_message,
     timestamp: endTimeStr,
     start_time: startTimeStr,
     metadata,
@@ -587,7 +598,7 @@ function createSpans(sessionId, turnNum, turn, config) {
     provider_id: "openai",
     metadata: {},
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: completionMessage ? JSON.stringify(completionMessage) : "",
+    output: turn.assistant_message,
     prompt_messages: promptMessages,
     completion_message: completionMessage,
     timestamp: endTimeStr,
@@ -607,7 +618,7 @@ function createSpans(sessionId, turnNum, turn, config) {
       provider_id: "",
       metadata: reasoningTokens > 0 ? { reasoning_tokens: reasoningTokens } : {},
       input: "",
-      output: reasoningTokens > 0 ? `[Reasoning: ${reasoningTokens} tokens]` : "[Reasoning]",
+      output: turn.reasoning_text || (reasoningTokens > 0 ? `[Reasoning: ${reasoningTokens} tokens]` : "[Reasoning]"),
       timestamp: endTimeStr,
       start_time: startTimeStr
     });

package/dist/hooks/codex-cli.js

@@ -99,6 +99,7 @@ function extractTurns(events) {
                     tool_calls: [],
                     tool_outputs: [],
                     reasoning: false,
+                    reasoning_text: '',
                     token_usage: {},
                 };
             }
@@ -147,15 +148,26 @@ function extractTurns(events) {
                 });
             }
             else if (itemType === 'reasoning') {
-                if (current)
+                if (current) {
                     current.reasoning = true;
+                    const summary = String(payload.summary ?? payload.text ?? '');
+                    if (summary)
+                        current.reasoning_text += (current.reasoning_text ? '\n' : '') + summary;
+                }
             }
             else if (itemType === 'web_search_call') {
                 const action = (payload.action ?? {});
+                const syntheticId = `web_search_${timestamp}`;
                 current.tool_calls.push({
                     name: 'web_search',
                     arguments: JSON.stringify({ query: action.query ?? '' }),
-                    call_id: `web_search_${timestamp}`,
+                    call_id: syntheticId,
+                    timestamp,
+                });
+                // Web search has no separate output event; record query as output
+                current.tool_outputs.push({
+                    call_id: syntheticId,
+                    output: `Search: ${action.query ?? ''}`,
                     timestamp,
                 });
             }
@@ -218,7 +230,7 @@ function createSpans(sessionId, turnNum, turn, config) {
         provider_id: '',
         span_path: '',
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: completionMessage ? JSON.stringify(completionMessage) : '',
+        output: turn.assistant_message,
         timestamp: endTimeStr,
         start_time: startTimeStr,
         metadata,
@@ -236,7 +248,7 @@ function createSpans(sessionId, turnNum, turn, config) {
         provider_id: 'openai',
         metadata: {},
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: completionMessage ? JSON.stringify(completionMessage) : '',
+        output: turn.assistant_message,
         prompt_messages: promptMessages,
         completion_message: completionMessage,
         timestamp: endTimeStr,
@@ -257,7 +269,7 @@ function createSpans(sessionId, turnNum, turn, config) {
             provider_id: '',
             metadata: reasoningTokens > 0 ? { reasoning_tokens: reasoningTokens } : {},
             input: '',
-            output: reasoningTokens > 0 ? `[Reasoning: ${reasoningTokens} tokens]` : '[Reasoning]',
+            output: turn.reasoning_text || (reasoningTokens > 0 ? `[Reasoning: ${reasoningTokens} tokens]` : '[Reasoning]'),
             timestamp: endTimeStr,
             start_time: startTimeStr,
         });

package/dist/hooks/gemini-cli.cjs

@@ -417,10 +417,20 @@ function clearStreamState(sessionId) {
 function extractMessages(hookData) {
   const llmReq = hookData.llm_request ?? {};
   const messages = llmReq.messages ?? [];
-  return messages.map((msg) => ({
-    role: String(msg.role ?? "user") === "model" ? "assistant" : String(msg.role ?? "user"),
-    content: truncate(String(msg.content ?? ""), MAX_CHARS)
-  }));
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const role = String(messages[i].role ?? "user");
+    if (role === "user") {
+      return [{ role: "user", content: truncate(String(messages[i].content ?? ""), MAX_CHARS) }];
+    }
+  }
+  if (messages.length > 0) {
+    const last = messages[messages.length - 1];
+    return [{
+      role: String(last.role ?? "user") === "model" ? "assistant" : String(last.role ?? "user"),
+      content: truncate(String(last.content ?? ""), MAX_CHARS)
+    }];
+  }
+  return [];
 }
 function detectModel(hookData) {
   const override = process.env.RESPAN_GEMINI_MODEL;
@@ -443,8 +453,9 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     spanName: "gemini-cli"
   });
   const safeId = sessionId.replace(/[/\\]/g, "_").slice(0, 50);
-  const traceUniqueId = `gcli_${safeId}`;
-  const rootSpanId = `gcli_${safeId}_root`;
+  const turnTs = beginTime.replace(/[^0-9]/g, "").slice(0, 14);
+  const traceUniqueId = `gcli_${safeId}_${turnTs}`;
+  const rootSpanId = `gcli_${safeId}_${turnTs}_root`;
   const threadId = `gcli_${sessionId}`;
   const llmReq = hookData.llm_request ?? {};
   const reqConfig = llmReq.config ?? {};
@@ -463,7 +474,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     provider_id: "",
     span_path: "",
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: JSON.stringify(completionMessage),
+    output: truncate(outputText, MAX_CHARS),
     timestamp: endTime,
     start_time: beginTime,
     metadata,
@@ -471,7 +482,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
   });
   const genSpan = {
     trace_unique_id: traceUniqueId,
-    span_unique_id: `gcli_${safeId}_gen`,
+    span_unique_id: `gcli_${safeId}_${turnTs}_gen`,
     span_parent_id: rootSpanId,
     span_name: "gemini.chat",
     span_workflow_name: workflowName,
@@ -480,7 +491,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     provider_id: "google",
     metadata: {},
     input: promptMessages.length ? JSON.stringify(promptMessages) : "",
-    output: JSON.stringify(completionMessage),
+    output: truncate(outputText, MAX_CHARS),
     timestamp: endTime,
     start_time: beginTime,
     prompt_tokens: tokens.prompt_tokens,
@@ -494,7 +505,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
   if (thoughtsTokens > 0) {
     spans.push({
       trace_unique_id: traceUniqueId,
-      span_unique_id: `gcli_${safeId}_reasoning`,
+      span_unique_id: `gcli_${safeId}_${turnTs}_reasoning`,
       span_parent_id: rootSpanId,
       span_name: "Reasoning",
       span_workflow_name: workflowName,
@@ -522,7 +533,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}_tool_${i + 1}`,
+      span_unique_id: `gcli_${safeId}_${turnTs}_tool_${i + 1}`,
       span_parent_id: rootSpanId,
       span_name: `Tool: ${displayName}`,
       span_workflow_name: workflowName,
@@ -710,6 +721,17 @@ function processChunk(hookData) {
         }
       }
     }
+    const grounding = candidates[0].groundingMetadata ?? llmResp.groundingMetadata;
+    if (grounding && typeof grounding === "object") {
+      const queries = grounding.webSearchQueries ?? grounding.searchQueries ?? [];
+      if (queries.length > 0) {
+        chunkToolDetails.push({
+          name: "google_web_search",
+          args: { queries },
+          output: truncate(queries.join(", "), MAX_CHARS)
+        });
+      }
+    }
   }
   const messages = hookData.llm_request?.messages ?? [];
   const currentMsgCount = messages.length;
@@ -737,6 +759,14 @@ function processChunk(hookData) {
     state.accumulated_text += chunkText;
     state.last_tokens = completionTokens || state.last_tokens;
     if (thoughtsTokens > 0) state.thoughts_tokens = thoughtsTokens;
+  }
+  const groundingDetails = chunkToolDetails.filter((d) => d.name === "google_web_search");
+  if (groundingDetails.length) {
+    state.tool_details = [...state.tool_details ?? [], ...groundingDetails];
+    state.tool_turns = (state.tool_turns ?? 0) + groundingDetails.length;
+    debug(`Grounding search detected: ${groundingDetails.length} queries`);
+  }
+  if (chunkText || groundingDetails.length) {
     saveStreamState(sessionId, state);
     debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
   }

package/dist/hooks/gemini-cli.js

@@ -118,10 +118,21 @@ function clearStreamState(sessionId) {
 function extractMessages(hookData) {
     const llmReq = (hookData.llm_request ?? {});
     const messages = (llmReq.messages ?? []);
-    return messages.map((msg) => ({
-        role: String(msg.role ?? 'user') === 'model' ? 'assistant' : String(msg.role ?? 'user'),
-        content: truncate(String(msg.content ?? ''), MAX_CHARS),
-    }));
+    // Only include the last user message, not the full conversation history
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const role = String(messages[i].role ?? 'user');
+        if (role === 'user') {
+            return [{ role: 'user', content: truncate(String(messages[i].content ?? ''), MAX_CHARS) }];
+        }
+    }
+    if (messages.length > 0) {
+        const last = messages[messages.length - 1];
+        return [{
+                role: String(last.role ?? 'user') === 'model' ? 'assistant' : String(last.role ?? 'user'),
+                content: truncate(String(last.content ?? ''), MAX_CHARS),
+            }];
+    }
+    return [];
 }
 function detectModel(hookData) {
     const override = process.env.RESPAN_GEMINI_MODEL;
@@ -146,8 +157,10 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
         spanName: 'gemini-cli',
     });
     const safeId = sessionId.replace(/[/\\]/g, '_').slice(0, 50);
-    const traceUniqueId = `gcli_${safeId}`;
-    const rootSpanId = `gcli_${safeId}_root`;
+    // Use first chunk timestamp to differentiate turns within the same session
+    const turnTs = beginTime.replace(/[^0-9]/g, '').slice(0, 14);
+    const traceUniqueId = `gcli_${safeId}_${turnTs}`;
+    const rootSpanId = `gcli_${safeId}_${turnTs}_root`;
     const threadId = `gcli_${sessionId}`;
     // LLM config
     const llmReq = (hookData.llm_request ?? {});
@@ -171,7 +184,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
         provider_id: '',
         span_path: '',
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: JSON.stringify(completionMessage),
+        output: truncate(outputText, MAX_CHARS),
         timestamp: endTime,
         start_time: beginTime,
         metadata,
@@ -180,7 +193,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     // Generation child span
     const genSpan = {
         trace_unique_id: traceUniqueId,
-        span_unique_id: `gcli_${safeId}_gen`,
+        span_unique_id: `gcli_${safeId}_${turnTs}_gen`,
         span_parent_id: rootSpanId,
         span_name: 'gemini.chat',
         span_workflow_name: workflowName,
@@ -189,7 +202,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
         provider_id: 'google',
         metadata: {},
         input: promptMessages.length ? JSON.stringify(promptMessages) : '',
-        output: JSON.stringify(completionMessage),
+        output: truncate(outputText, MAX_CHARS),
         timestamp: endTime,
         start_time: beginTime,
         prompt_tokens: tokens.prompt_tokens,
@@ -206,7 +219,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     if (thoughtsTokens > 0) {
         spans.push({
             trace_unique_id: traceUniqueId,
-            span_unique_id: `gcli_${safeId}_reasoning`,
+            span_unique_id: `gcli_${safeId}_${turnTs}_reasoning`,
             span_parent_id: rootSpanId,
             span_name: 'Reasoning',
             span_workflow_name: workflowName,
@@ -237,7 +250,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}_tool_${i + 1}`,
+            span_unique_id: `gcli_${safeId}_${turnTs}_tool_${i + 1}`,
             span_parent_id: rootSpanId,
             span_name: `Tool: ${displayName}`,
             span_workflow_name: workflowName,
@@ -436,6 +449,18 @@ function processChunk(hookData) {
                 }
             }
         }
+        // Detect server-side grounding (google_web_search) from groundingMetadata
+        const grounding = (candidates[0].groundingMetadata ?? llmResp.groundingMetadata);
+        if (grounding && typeof grounding === 'object') {
+            const queries = (grounding.webSearchQueries ?? grounding.searchQueries ?? []);
+            if (queries.length > 0) {
+                chunkToolDetails.push({
+                    name: 'google_web_search',
+                    args: { queries },
+                    output: truncate(queries.join(', '), MAX_CHARS),
+                });
+            }
+        }
     }
     const messages = (hookData.llm_request?.messages ?? []);
     const currentMsgCount = messages.length;
@@ -460,7 +485,7 @@ function processChunk(hookData) {
         }
     }
     state.msg_count = currentMsgCount;
-    // Accumulate text
+    // Accumulate text and grounding tool details
     if (chunkText) {
         if (!state.first_chunk_time)
             state.first_chunk_time = nowISO();
@@ -468,6 +493,15 @@ function processChunk(hookData) {
         state.last_tokens = completionTokens || state.last_tokens;
         if (thoughtsTokens > 0)
             state.thoughts_tokens = thoughtsTokens;
+    }
+    // Save grounding tool details (these arrive with text, not as separate tool turns)
+    const groundingDetails = chunkToolDetails.filter(d => d.name === 'google_web_search');
+    if (groundingDetails.length) {
+        state.tool_details = [...(state.tool_details ?? []), ...groundingDetails];
+        state.tool_turns = (state.tool_turns ?? 0) + groundingDetails.length;
+        debug(`Grounding search detected: ${groundingDetails.length} queries`);
+    }
+    if (chunkText || groundingDetails.length) {
         saveStreamState(sessionId, state);
         debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
     }