Merge pull request #3 from TimJJTing/fix/stop-transcript-format

Fix: Stop hook speech bubble delayed by one turn

Author: TimJJTing

.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claudesay",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Renders Claude replies as ASCII character speech bubbles",
   "author": {
     "name": "TimJJTing"

hooks/scripts/stop.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+INPUT=$(cat)
+
 FLAG="${CLAUDE_PROJECT_DIR}/.claude/.claudesay-active"
 [[ -f "$FLAG" ]] || { printf '{"decision":"approve"}\n'; exit 0; }
 
@@ -9,37 +11,18 @@ if ! command -v jq &>/dev/null; then
   exit 0
 fi
 
-INPUT=$(cat)
-TRANSCRIPT=$(printf '%s' "$INPUT" | jq -r '.transcript_path // empty' 2>/dev/null || true)
-
-if [[ -z "$TRANSCRIPT" || ! -f "$TRANSCRIPT" ]]; then
-  printf '{"decision":"approve"}\n'
-  exit 0
-fi
-
-# Extract the last assistant text block from the JSONL transcript.
-# Claude Code transcripts wrap each turn under a "message" key:
-#   {"message": {"role": "assistant", "content": [...]}}
-LAST_MSG=$(jq -rs '
-  map(select(.message.role == "assistant"))
-  | if length == 0 then ""
-    else last
-      | .message.content
-      | if type == "array" then
-          map(select(.type == "text") | .text) | join("")
-        elif type == "string" then .
-        else ""
-        end
-    end
-' "$TRANSCRIPT" 2>/dev/null || true)
+# Use response_preview (current turn, first 500 chars) instead of transcript.
+# The transcript is written AFTER the Stop hook returns, so transcript-based
+# extraction is always one turn behind.
+RESPONSE=$(printf '%s' "$INPUT" | jq -r '.response_preview // empty' 2>/dev/null || true)
 
-if [[ -z "$LAST_MSG" ]]; then
+if [[ -z "$RESPONSE" ]]; then
   printf '{"decision":"approve"}\n'
   exit 0
 fi
 
 # Extract the last <claudesay> tag (POSIX grep -o, no -P needed).
-TAG=$(printf '%s' "$LAST_MSG" \
+TAG=$(printf '%s' "$RESPONSE" \
   | grep -o '<claudesay mood="[^"]*">[^<]*</claudesay>' \
   | tail -1 || true)
 
@@ -49,9 +32,6 @@ if [[ -n "$TAG" ]]; then
 
   RENDER="${CLAUDE_PLUGIN_ROOT}/lib/render.sh"
   if [[ -f "$RENDER" ]]; then
-    # Capture render into temp file so we can emit as systemMessage.
-    # Writing to /dev/tty gets clobbered when Claude Code's TUI redraws its
-    # dynamic region; systemMessage lands in permanent scrollback instead.
     TMP=$(mktemp)
     CLAUDE_SAY_TTY="$TMP" bash "$RENDER" "$MSG" "$MOOD" 2>/dev/null || true
     BUBBLE=$(cat "$TMP" 2>/dev/null || true)

tests/test-hooks.sh

@@ -11,59 +11,49 @@ mkdir -p "${CLAUDE_PROJECT_DIR}/.claude"
 FLAG="${CLAUDE_PROJECT_DIR}/.claude/.claudesay-active"
 trap 'rm -f "$TTY_FILE"; rm -rf "$CLAUDE_PROJECT_DIR"' EXIT
 
-# Helper: write a transcript in the Claude Code JSONL format.
-# Each entry wraps the message under a "message" key, matching what
-# ~/.claude/projects/<proj>/<session>.jsonl actually contains.
-make_transcript() {
-  local text="$1"
-  local tmp; tmp=$(mktemp)
-  jq -n '{"type":"user","message":{"role":"user","content":"hello"}}' >> "$tmp"
-  jq -n --arg t "$text" \
-    '{"message":{"role":"assistant","content":[{"type":"text","text":$t}]}}' >> "$tmp"
-  echo "$tmp"
-}
-
+# run_stop passes a response_preview string directly, matching the real Stop
+# hook input. Using response_preview avoids the one-turn delay caused by the
+# transcript being written AFTER the hook returns.
 run_stop() {
-  local transcript="$1"
-  printf '{"transcript_path":"%s"}\n' "$transcript" \
+  local preview="$1"
+  jq -n --arg p "$preview" '{"response_preview":$p}' \
     | bash "$PLUGIN_ROOT/hooks/scripts/stop.sh"
 }
 
 echo "=== stop.sh: flag absent → silent approve ==="
 rm -f "$FLAG"
-out=$(run_stop /dev/null)
+out=$(run_stop "hello <claudesay mood=\"happy\">hi</claudesay>")
 assert_eq "returns approve when flag absent" "$out" '{"decision":"approve"}'
 assert_eq "no tty output when flag absent" "$(cat "$TTY_FILE")" ""
 
 echo ""
 echo "=== stop.sh: flag present, tag found → emits systemMessage bubble ==="
 mkdir -p "$(dirname "$FLAG")"; touch "$FLAG"
-TRANSCRIPT=$(make_transcript 'Great job! <claudesay mood="excited">All 3 tests pass!</claudesay>')
-out=$(run_stop "$TRANSCRIPT")
+out=$(run_stop 'Great job! <claudesay mood="excited">All 3 tests pass!</claudesay>')
 assert_contains "returns approve decision" "$out" '"decision": "approve"'
 assert_contains "emits systemMessage key" "$out" '"systemMessage"'
 parsed=$(printf '%s' "$out" | jq -r '.systemMessage' 2>/dev/null || true)
 assert_contains "bubble content in systemMessage" "$parsed" "All 3 tests pass!"
 assert_eq "no direct tty write" "$(cat "$TTY_FILE")" ""
 > "$TTY_FILE"
-rm -f "$TRANSCRIPT"
 
 echo ""
 echo "=== stop.sh: flag present, no tag → silent approve ==="
-TRANSCRIPT=$(make_transcript 'Here is some code without a tag')
-out=$(run_stop "$TRANSCRIPT")
+out=$(run_stop 'Here is some code without a tag')
 assert_eq "returns approve when no tag" "$out" '{"decision":"approve"}'
 assert_eq "no tty output when no tag" "$(cat "$TTY_FILE")" ""
-rm -f "$TRANSCRIPT"
 
 echo ""
 echo "=== stop.sh: multiple tags → uses last one ==="
-TRANSCRIPT=$(make_transcript 'First <claudesay mood="happy">first msg</claudesay> then <claudesay mood="excited">second msg</claudesay>')
-out=$(run_stop "$TRANSCRIPT")
+out=$(run_stop 'First <claudesay mood="happy">first msg</claudesay> then <claudesay mood="excited">second msg</claudesay>')
 parsed=$(printf '%s' "$out" | jq -r '.systemMessage' 2>/dev/null || true)
 assert_contains "last tag wins" "$parsed" "second msg"
 > "$TTY_FILE"
-rm -f "$TRANSCRIPT"
+
+echo ""
+echo "=== stop.sh: empty response_preview → silent approve ==="
+out=$(run_stop '')
+assert_eq "returns approve on empty preview" "$out" '{"decision":"approve"}'
 
 echo ""
 echo "=== pre-tool-use.sh: flag absent → silent allow ==="