caruso 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eed6a0c1f2de97f2f16bdced1953bde78c4d1687e57a2be7686f4d824cce363
-  data.tar.gz: 31ad0e3bf661f0883e852c015633e42e59c2265d899b3d987ea35b64dc10d2ea
+  metadata.gz: c881250221622ad116a1da441ca090a80fa1830f3d51b675b4a0919853d82287
+  data.tar.gz: 4276216066d112d8bed3e99c5d2928bd6d28ba1b44c4d2847f95f0f9447b803f
 SHA512:
-  metadata.gz: d6ec542034f0cc10881b61d008b2a49fda43cfeeaed43565b00fde4c12ae0ca8a821311a9465a6ae697353047c942047281e5fed7d7b7d32c9ca4b406daaccac
-  data.tar.gz: ba2ef61be533cfd99052705ab8d0fc8489596107cf8170410b7e2edf903c0de1541f698eeda2a65b7657a655ea536259547386bffc2d5db0af932bbeaff4fc76
+  metadata.gz: ebf987777a3b98062f132330f17ba646840085cd63a123c04d944997002c42c1049cb325f0eb66dfee4ecb0dfb4127b279a96e6a298aa73b1bb61f56ce7caba5
+  data.tar.gz: fe109bde2907c60ef0c15f3eaa4e4ea7fc1a4f98d2f0c05f7ceaad78b7e2ab0ea7c632fa7851497df8630aeff7adb145f7bab093059af136519cfdb80ad62e5d

data/lib/caruso/adapters/hook_adapter.rb

@@ -32,37 +32,7 @@ module Caruso
       STOP_EVENTS = %w[stop subagentStop].freeze
 
       WRAPPER_PATH = File.join(".cursor", "hooks", "caruso", "_cc_stop_wrapper.sh").freeze
-
-      # Translates Claude Code stop hook output to Cursor format.
-      # CC: {"decision":"block","reason":"..."} or exit 2 with stderr
-      # Cursor: {"followup_message":"..."}
-      CC_STOP_WRAPPER = <<~'BASH'
-        #!/bin/bash
-        set -uo pipefail
-        SCRIPT="$1"
-        shift
-        STDERR_TMP=$(mktemp) || exit 1
-        trap 'rm -f "$STDERR_TMP"' EXIT
-        OUTPUT=$("$SCRIPT" "$@" 2>"$STDERR_TMP")
-        EXIT_CODE=$?
-        if [ $EXIT_CODE -eq 2 ]; then
-          REASON=$(cat "$STDERR_TMP")
-          if [ -n "$REASON" ] && command -v jq >/dev/null 2>&1; then
-            jq -n --arg msg "$REASON" '{"followup_message": $msg}'
-          fi
-          exit 0
-        fi
-        if [ $EXIT_CODE -eq 0 ] && [ -n "$OUTPUT" ] && command -v jq >/dev/null 2>&1; then
-          DECISION=$(echo "$OUTPUT" | jq -r '.decision // empty' 2>/dev/null)
-          if [ "$DECISION" = "block" ]; then
-            REASON=$(echo "$OUTPUT" | jq -r '.reason // empty' 2>/dev/null)
-            [ -n "$REASON" ] && jq -n --arg msg "$REASON" '{"followup_message": $msg}'
-            exit 0
-          fi
-        fi
-        [ -n "$OUTPUT" ] && echo "$OUTPUT"
-        exit $EXIT_CODE
-      BASH
+      WRAPPER_SOURCE = File.expand_path("../scripts/cc_stop_wrapper.sh", __dir__).freeze
 
       # Contains translated hook commands keyed by event (for clean uninstall tracking).
       attr_reader :translated_hooks
@@ -145,20 +115,28 @@ module Caruso
               next
             end
 
-            command = hook["command"]
-            next unless command
+            cursor_entry = build_cursor_hook(event_name, matcher, hook)
+            next unless cursor_entry
 
-            cursor_event = resolve_cursor_event(event_name, matcher)
-            cursor_hook = { "command" => command }
-            cursor_hook["timeout"] = hook["timeout"] if hook["timeout"]
-            cursor_hook["loop_limit"] = nil if STOP_EVENTS.include?(cursor_event)
-            (hooks[cursor_event] ||= []) << cursor_hook
+            event, entry = cursor_entry
+            (hooks[event] ||= []) << entry
           end
         end
 
         { hooks: hooks, skipped_prompts: skipped }
       end
 
+      def build_cursor_hook(event_name, matcher, hook)
+        command = hook["command"]
+        return unless command
+
+        cursor_event = resolve_cursor_event(event_name, matcher)
+        cursor_hook = { "command" => command }
+        cursor_hook["timeout"] = hook["timeout"] if hook["timeout"]
+        cursor_hook["loop_limit"] = nil if STOP_EVENTS.include?(cursor_event)
+        [cursor_event, cursor_hook]
+      end
+
       def warn_skipped(skipped_events, skipped_prompts)
         if skipped_events.any?
           unique_skipped = skipped_events.uniq
@@ -244,7 +222,7 @@ module Caruso
 
       def install_wrapper_script
         FileUtils.mkdir_p(File.dirname(WRAPPER_PATH))
-        File.write(WRAPPER_PATH, CC_STOP_WRAPPER)
+        FileUtils.cp(WRAPPER_SOURCE, WRAPPER_PATH)
         File.chmod(0o755, WRAPPER_PATH)
         puts "Installed stop hook wrapper: #{WRAPPER_PATH}"
         WRAPPER_PATH

data/lib/caruso/scripts/cc_stop_wrapper.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# Translates Claude Code stop hook output to Cursor format.
+#
+# CC stop hooks communicate via:
+#   Exit 2 + stderr reason       -> block (continue conversation)
+#   Exit 0 + {"decision":"block","reason":"..."} -> block
+#   Exit 0 + anything else       -> allow stop
+#
+# Cursor stop hooks expect:
+#   Exit 0 + {"followup_message":"..."} -> continue with message
+#   Exit 0 + no output                 -> allow stop
+#
+# Usage: cc_stop_wrapper.sh <original-script> [args...]
+
+set -uo pipefail
+
+SCRIPT="$1"
+shift
+
+STDERR_TMP=$(mktemp) || exit 1
+trap 'rm -f "$STDERR_TMP"' EXIT
+
+OUTPUT=$("$SCRIPT" "$@" 2>"$STDERR_TMP")
+EXIT_CODE=$?
+
+# CC exit 2 = block with stderr reason
+if [ $EXIT_CODE -eq 2 ]; then
+  REASON=$(cat "$STDERR_TMP")
+  if [ -n "$REASON" ] && command -v jq >/dev/null 2>&1; then
+    jq -n --arg msg "$REASON" '{"followup_message": $msg}'
+  fi
+  exit 0
+fi
+
+# CC exit 0 + JSON {"decision":"block"} -> translate to followup_message
+if [ $EXIT_CODE -eq 0 ] && [ -n "$OUTPUT" ] && command -v jq >/dev/null 2>&1; then
+  DECISION=$(echo "$OUTPUT" | jq -r '.decision // empty' 2>/dev/null)
+  if [ "$DECISION" = "block" ]; then
+    REASON=$(echo "$OUTPUT" | jq -r '.reason // empty' 2>/dev/null)
+    [ -n "$REASON" ] && jq -n --arg msg "$REASON" '{"followup_message": $msg}'
+    exit 0
+  fi
+fi
+
+# Pass through anything else unchanged
+[ -n "$OUTPUT" ] && echo "$OUTPUT"
+exit $EXIT_CODE

data/lib/caruso/stop_hook_translator.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "json"
+require "open3"
+
+module Caruso
+  # Translates Claude Code stop hook output to Cursor format.
+  #
+  # Claude Code stop hooks communicate via:
+  #   - Exit 2 + stderr message        → block (continue the conversation)
+  #   - Exit 0 + {"decision":"block","reason":"..."} → block
+  #   - Exit 0 + no decision           → allow stop
+  #
+  # Cursor stop hooks expect:
+  #   - Exit 0 + {"followup_message":"..."} → continue with message
+  #   - Exit 0 + no output                 → allow stop
+  class StopHookTranslator
+    def self.translate(stdout:, stderr:, exit_code:)
+      new(stdout: stdout, stderr: stderr, exit_code: exit_code).translate
+    end
+
+    def initialize(stdout:, stderr:, exit_code:)
+      @stdout = stdout.to_s.strip
+      @stderr = stderr.to_s.strip
+      @exit_code = exit_code
+    end
+
+    def translate
+      return translate_exit2 if @exit_code == 2
+      return translate_json_decision if @exit_code.zero? && block_decision?
+
+      # Pass through: non-blocking exit 0 or any other exit code
+      { stdout: @stdout, exit_code: @exit_code }
+    end
+
+    private
+
+    def translate_exit2
+      if @stderr.empty?
+        { stdout: "", exit_code: 0 }
+      else
+        { stdout: JSON.generate({ "followup_message" => @stderr }), exit_code: 0 }
+      end
+    end
+
+    def translate_json_decision
+      reason = parsed_output&.fetch("reason", nil).to_s
+      if reason.empty?
+        { stdout: "", exit_code: 0 }
+      else
+        { stdout: JSON.generate({ "followup_message" => reason }), exit_code: 0 }
+      end
+    end
+
+    def block_decision?
+      parsed_output&.fetch("decision", nil) == "block"
+    end
+
+    def parsed_output
+      return @parsed_output if defined?(@parsed_output)
+
+      @parsed_output = @stdout.empty? ? nil : JSON.parse(@stdout)
+    rescue JSON::ParserError
+      @parsed_output = nil
+    end
+  end
+end

data/lib/caruso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Caruso
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caruso
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Philipp Comans
@@ -163,6 +163,8 @@ files:
 - lib/caruso/remover.rb
 - lib/caruso/safe_dir.rb
 - lib/caruso/safe_file.rb
+- lib/caruso/scripts/cc_stop_wrapper.sh
+- lib/caruso/stop_hook_translator.rb
 - lib/caruso/version.rb
 - package-lock.json
 - reference/claude_code.md