@respan/cli 0.6.1 → 0.6.3

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;
@@ -720,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: "" };
@@ -738,6 +757,8 @@ function processChunk(hookData) {
     state.accumulated_text += chunkText;
     state.last_tokens = completionTokens || state.last_tokens;
     if (thoughtsTokens > 0) state.thoughts_tokens = thoughtsTokens;
+  }
+  if (chunkText) {
     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;
@@ -448,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: '' };
@@ -462,7 +484,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();
@@ -470,6 +492,8 @@ function processChunk(hookData) {
         state.last_tokens = completionTokens || state.last_tokens;
         if (thoughtsTokens > 0)
             state.thoughts_tokens = thoughtsTokens;
+    }
+    if (chunkText) {
         saveStreamState(sessionId, state);
         debug(`Accumulated chunk: +${chunkText.length} chars, total=${state.accumulated_text.length}`);
     }