fix: claude-plugin check if assistant has content

Author: harshithmullapudi

packages/hook-utils/src/transcript.ts

@@ -33,71 +33,6 @@ function extractMessageContent(parsed: any): string {
   }
 }
 
-/**
- * Extract last message of specified role from transcript JSONL file
- * @param transcriptPath Path to transcript file
- * @param role 'user' or 'assistant'
- * @param stripSystemReminders Whether to remove <system-reminder> tags (for assistant)
- */
-export function extractLastMessage(
-  transcriptPath: string,
-  role: "user" | "assistant",
-  stripSystemReminders: boolean = false
-): string {
-  if (!transcriptPath || !existsSync(transcriptPath)) {
-    throw new Error(`Transcript path missing or file does not exist: ${transcriptPath}`);
-  }
-
-  const content = readFileSync(transcriptPath, "utf-8").trim();
-  if (!content) {
-    throw new Error(`Transcript file exists but is empty: ${transcriptPath}`);
-  }
-
-  const lines = content.split("\n");
-  let foundMatchingRole = false;
-
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const line = JSON.parse(lines[i]);
-    if (line.type === role) {
-      foundMatchingRole = true;
-
-      if (line.message?.content) {
-        let text = "";
-        const msgContent = line.message.content;
-
-        if (typeof msgContent === "string") {
-          text = msgContent;
-        } else if (Array.isArray(msgContent)) {
-          text = msgContent
-            .filter((c: any) => c.type === "text")
-            .map((c: any) => c.text)
-            .join("\n");
-        } else {
-          // Unknown content format - throw error
-          throw new Error(
-            `Unknown message content format in transcript. Type: ${typeof msgContent}`
-          );
-        }
-
-        if (stripSystemReminders) {
-          text = text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "");
-          text = text.replace(/\n{3,}/g, "\n\n").trim();
-        }
-
-        // Return text even if empty - caller decides if that's an error
-        return text;
-      }
-    }
-  }
-
-  // If we searched the whole transcript and didn't find any message of this role
-  if (!foundMatchingRole) {
-    throw new Error(`No message found for role '${role}' in transcript: ${transcriptPath}`);
-  }
-
-  return "";
-}
-
 const DEFAULTS = ["[Request interrupted by user for tool use]"];
 
 /**
@@ -126,7 +61,7 @@ export function extractLastAssistantWithPrecedingUsers(
   // Find the last assistant message
   let lastAssistantIndex = -1;
   for (let i = parsedLines.length - 1; i >= 0; i--) {
-    let assistantMessage = extractMessageContent(parsedLines[lastAssistantIndex]);
+    let assistantMessage = extractMessageContent(parsedLines[i]);
 
     if (parsedLines[i].type === "assistant" && assistantMessage) {
       lastAssistantIndex = i;
@@ -158,9 +93,19 @@ export function extractLastAssistantWithPrecedingUsers(
     if (parsed.type === "assistant" && parsed.message && gotAtleastOne && content) {
       // Stop when we hit another assistant message
       break;
-    } else if (parsed.type === "user" && !DEFAULTS.includes(content) && content) {
+    } else if (parsed.type === "user" && parsed.message && !DEFAULTS.includes(content) && content) {
       // Collect user message (we'll reverse later to maintain chronological order)
-      userMessages.unshift(content);
+
+      let strippedcontent = content.replace(
+        /<local-command-caveat>[\s\S]*?<\/local-command-caveat>/g,
+        ""
+      );
+      strippedcontent = content.replace(
+        /<local-command-stdout>[\s\S]*?<\/local-command-stdout>/g,
+        ""
+      );
+
+      userMessages.unshift(strippedcontent);
       gotAtleastOne = true;
     }
   }

plugin/scripts/cli.mjs

@@ -65,7 +65,7 @@ function extractLastAssistantWithPrecedingUsers(transcriptPath, stripSystemRemin
   const parsedLines = lines.map((line) => JSON.parse(line));
   let lastAssistantIndex = -1;
   for (let i = parsedLines.length - 1; i >= 0; i--) {
-    let assistantMessage2 = extractMessageContent(parsedLines[lastAssistantIndex]);
+    let assistantMessage2 = extractMessageContent(parsedLines[i]);
     if (parsedLines[i].type === "assistant" && assistantMessage2) {
       lastAssistantIndex = i;
       break;
@@ -86,8 +86,10 @@ function extractLastAssistantWithPrecedingUsers(transcriptPath, stripSystemRemin
     const content2 = extractMessageContent(parsed);
     if (parsed.type === "assistant" && parsed.message && gotAtleastOne && content2) {
       break;
-    } else if (parsed.type === "user" && !DEFAULTS.includes(content2) && content2) {
-      userMessages.unshift(content2);
+    } else if (parsed.type === "user" && parsed.message && !DEFAULTS.includes(content2) && content2) {
+      let strippedcontent = content2.replace(/<local-command-caveat>[\s\S]*?<\/local-command-caveat>/g, "");
+      strippedcontent = content2.replace(/<local-command-stdout>[\s\S]*?<\/local-command-stdout>/g, "");
+      userMessages.unshift(strippedcontent);
       gotAtleastOne = true;
     }
   }

plugin/scripts/run-conversation-read.mjs

@@ -19,12 +19,16 @@ function extractMessageContent(parsed) {
     throw new Error(`Unknown message content format. Type: ${typeof msgContent}`);
   }
 }
+
+var DEFAULTS = ["[Request interrupted by user for tool use]"];
+
 __name(extractMessageContent, "extractMessageContent");
-function extractLastAssistantWithPrecedingUsers(_transcriptPath, stripSystemReminders = false) {
+function extractLastAssistantWithPrecedingUsers(transcriptPath, stripSystemReminders = false) {
+  // const transcriptPath =
+  // "/Users/harshithmullapudi/.claude/projects/-Users-harshithmullapudi-Documents-core/48ab3b13-0743-40c7-8733-1c42049343ba.jsonl";
   if (!transcriptPath || !existsSync(transcriptPath)) {
     throw new Error(`Transcript path missing or file does not exist: ${transcriptPath}`);
   }
-
   const content = readFileSync(transcriptPath, "utf-8").trim();
   if (!content) {
     throw new Error(`Transcript file exists but is empty: ${transcriptPath}`);
@@ -33,7 +37,8 @@ function extractLastAssistantWithPrecedingUsers(_transcriptPath, stripSystemRemi
   const parsedLines = lines.map((line) => JSON.parse(line));
   let lastAssistantIndex = -1;
   for (let i = parsedLines.length - 1; i >= 0; i--) {
-    if (parsedLines[i].type === "assistant") {
+    let assistantMessage2 = extractMessageContent(parsedLines[i]);
+    if (parsedLines[i].type === "assistant" && assistantMessage2) {
       lastAssistantIndex = i;
       break;
     }
@@ -51,14 +56,27 @@ function extractLastAssistantWithPrecedingUsers(_transcriptPath, stripSystemRemi
   }
   const userMessages = [];
   let gotAtleastOne = false;
-
   for (let i = lastAssistantIndex - 1; i >= 0; i--) {
     const parsed = parsedLines[i];
 
-    if (parsed.type === "assistant" && gotAtleastOne && extractMessageContent(parsed)) {
+    const content2 = extractMessageContent(parsed);
+    if (parsed.type === "assistant" && gotAtleastOne && content2) {
       break;
-    } else if (parsed.type === "user" && extractMessageContent(parsed)) {
-      userMessages.unshift(extractMessageContent(parsed));
+    } else if (
+      parsed.type === "user" &&
+      parsed.message &&
+      !DEFAULTS.includes(content2) &&
+      content2
+    ) {
+      let strippedcontent = content2.replace(
+        /<local-command-caveat>[\s\S]*?<\/local-command-caveat>/g,
+        ""
+      );
+      strippedcontent = content2.replace(
+        /<local-command-caveat>[\s\S]*?<\/local-command-caveat>/g,
+        ""
+      );
+      userMessages.unshift(strippedcontent);
       gotAtleastOne = true;
     }
   }