@respan/cli 0.6.2 → 0.6.4

package/dist/hooks/gemini-cli.cjs

@@ -721,17 +721,6 @@ 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;
@@ -741,8 +730,17 @@ function processChunk(hookData) {
   let toolCallDetected = false;
   if (savedMsgCount > 0 && currentMsgCount > savedMsgCount) {
     const newMsgs = messages.slice(savedMsgCount);
-    const hasNewUserMsg = newMsgs.some((m) => m.role === "user");
-    if (hasNewUserMsg) {
+    const hasRealUserMsg = newMsgs.some((m) => {
+      if (String(m.role ?? "") !== "user") return false;
+      const parts = m.parts ?? m.content;
+      if (Array.isArray(parts)) {
+        return !parts.some(
+          (p) => typeof p === "object" && p !== null && (p.functionResponse || p.toolResponse)
+        );
+      }
+      return true;
+    });
+    if (hasRealUserMsg) {
       debug(`New user message detected (msgs ${savedMsgCount} \u2192 ${currentMsgCount}), starting fresh turn`);
       clearStreamState(sessionId);
       state = { accumulated_text: "", last_tokens: 0, first_chunk_time: "" };
@@ -760,13 +758,7 @@ function processChunk(hookData) {
     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) {
+  if (chunkText) {
     saveStreamState(sessionId, state);
     debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
   }
@@ -782,8 +774,10 @@ function processChunk(hookData) {
     process.stdout.write("{}\n");
     return;
   }
+  const hasPendingTools = (state.pending_tools ?? []).length > 0;
+  const hadToolsThisTurn = (state.tool_turns ?? 0) > 0 || hasPendingTools;
   const hasNewText = state.accumulated_text.length > (state.last_send_text_len ?? 0);
-  const shouldSend = (!toolCallDetected || isFinished) && hasNewText && state.accumulated_text && (!chunkText || isFinished);
+  const shouldSend = hasNewText && state.accumulated_text && (isFinished || !hadToolsThisTurn && !toolCallDetected && !chunkText);
   process.stdout.write("{}\n");
   if (!shouldSend) {
     if (toolCallDetected) saveStreamState(sessionId, state);

package/dist/hooks/gemini-cli.js

@@ -449,18 +449,6 @@ 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;
@@ -471,8 +459,19 @@ function processChunk(hookData) {
     let toolCallDetected = false;
     if (savedMsgCount > 0 && currentMsgCount > savedMsgCount) {
         const newMsgs = messages.slice(savedMsgCount);
-        const hasNewUserMsg = newMsgs.some((m) => m.role === 'user');
-        if (hasNewUserMsg) {
+        // Distinguish real user messages from tool-result messages injected by Gemini.
+        // Tool results contain functionResponse / toolResponse objects in their parts.
+        const hasRealUserMsg = newMsgs.some((m) => {
+            if (String(m.role ?? '') !== 'user')
+                return false;
+            const parts = (m.parts ?? m.content);
+            if (Array.isArray(parts)) {
+                // If any part has functionResponse/toolResponse, it's a tool result, not a user message
+                return !parts.some((p) => typeof p === 'object' && p !== null && (p.functionResponse || p.toolResponse));
+            }
+            return true; // plain text user message
+        });
+        if (hasRealUserMsg) {
             debug(`New user message detected (msgs ${savedMsgCount} → ${currentMsgCount}), starting fresh turn`);
             clearStreamState(sessionId);
             state = { accumulated_text: '', last_tokens: 0, first_chunk_time: '' };
@@ -494,14 +493,7 @@ function processChunk(hookData) {
         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) {
+    if (chunkText) {
         saveStreamState(sessionId, state);
         debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
     }
@@ -518,12 +510,16 @@ function processChunk(hookData) {
         process.stdout.write('{}\n');
         return;
     }
-    // Detect completion and send
+    // Detect completion and send.
+    // If tools have been used this turn, only send on STOP to avoid
+    // splitting a multi-tool turn into separate traces.
+    const hasPendingTools = (state.pending_tools ?? []).length > 0;
+    const hadToolsThisTurn = (state.tool_turns ?? 0) > 0 || hasPendingTools;
     const hasNewText = state.accumulated_text.length > (state.last_send_text_len ?? 0);
-    const shouldSend = ((!toolCallDetected || isFinished)
-        && hasNewText
+    const shouldSend = (hasNewText
         && state.accumulated_text
-        && (!chunkText || isFinished));
+        && (isFinished
+            || (!hadToolsThisTurn && !toolCallDetected && !chunkText)));
     process.stdout.write('{}\n');
     if (!shouldSend) {
         if (toolCallDetected)

package/oclif.manifest.json

@@ -3459,5 +3459,5 @@
       ]
     }
   },
-  "version": "0.6.2"
+  "version": "0.6.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@respan/cli",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Respan CLI - manage your LLM observability from the command line",
   "type": "module",
   "main": "dist/index.js",