caruso 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718b4ebf40d78b4314d5ba6869ccf65d4e7ba02ada56c0c9b98e5de973d538c7
-  data.tar.gz: c6fcc0b7f7e45b6cd5e9235e954ea0c1cdc5d49fd729f0c6268e135ef7ac6bce
+  metadata.gz: 9f6520caf8c5e8a4946369e9722ca36685a6c79b933b67336bc02b39b0fca359
+  data.tar.gz: d1b2f7b52ae5746909e173b75fc31e601417bca1ef55af889a56f802a8ae1d24
 SHA512:
-  metadata.gz: 76693951a7604897ad48efaa2e81570165e483ab20e651ff757d009a4c179f21a7738f9912229dd768205736ee076fbf2f865e1b7549385ce4c320132674c08a
-  data.tar.gz: 691886bb54d63379e80df0663b0825f89b2dd7ece512fc2e859b90c7e09cc830c63c3f6c2cad4fe2dc6f83974eec03d728cb1c150240cf424821cb6948d2b7f4
+  metadata.gz: 48d8c7c701c7c1a380672ac77f3025dc69c90c4a5ef7d6fd6e72e50358e69440a9c57ff022f52f94c4970faead782ba04c223246bf766045e4508bca427cf4f8
+  data.tar.gz: 293893a825850e919ca8141203f307c300e9fdba931f80aafadad15a766dd5f28ff6bd061eae53891c5a4da41f061e2b4b6bea5f0108d9b79396e63d82f49296

data/AGENTS.md

@@ -273,4 +273,5 @@ Version is managed in `lib/caruso/version.rb`.
 
 # Memory
 - The goal is a clean, correct, consistent implementation. Never implement fallbacks that hide errors or engage in defensive programming.
+- **Idempotency**: Removal commands (`marketplace remove`, `plugin uninstall`) are designed to be idempotent. They exit successfully (0) if the target does not exist. This is intentional for automation friendliness and is NOT considered "hiding errors".
 - Treat the vendor directory .cursor/rules/caruso/ as a build artifact

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.2] - 2025-12-17
+
+### Fixed
+- `marketplace remove` now exits gracefully (code 0) when marketplace is not found, making it idempotent
+- Documented idempotent behavior of `marketplace remove` and `plugin uninstall` in README
+
 ## [0.6.0] - 2025-11-24
 
 ### Security
@@ -20,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Adapter` now strictly validates file existence and raises errors instead of silently skipping invalid files
 - `Fetcher` now filters glob results to ensure they remain within trusted plugin directories
 
+
 ## [0.5.3] - 2025-11-23
 
 ### Changed

data/caruso.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.0.0",
+  "marketplaces": {},
+  "plugins": {}
+}

data/impl.md

@@ -0,0 +1,111 @@
+# Implementation Plan - Evolve Caruso for Claude Code Support
+
+Refining caruso to provide robust support for Claude Code's Commands, Skills, and Hooks, adapting them specifically for the Cursor environment.
+
+## Goal Description
+
+The goal is to transform caruso from a simple markdown copier into a smart adapter that bridges the gap between Claude Code's plugin architecture and Cursor's steering mechanisms. This involves:
+
+- **Skills**: deeply adapting skills by not just copying the markdown, but also bundling associated scripts/ and making them executable.
+- **Commands**: mapping Claude Code commands to Cursor's new .cursor/commands/ structure.
+- **Hooks**: translating Claude Code's hooks/hooks.json events into Cursor's .cursor/hooks.json format.
+- **Fetcher**: upgrading the fetcher to retrieve auxiliary files (scripts, configs) beyond just `.md` files.
+
+## User Review Required
+
+> [!NOTE]
+> **Script Execution Security:** We will trust the "trusted workspace" model of Cursor. This means we will automatically fetch scripts and make them executable (`chmod +x`). Users relying on Caruso are expected to audit the plugins they install, similar to how they would audit an npm package.
+
+## Proposed Changes
+
+### 1. Fetcher Upgrades (`lib/caruso/fetcher.rb`)
+
+The current fetcher is overly focused on *.md files. We need to broaden it to fetch associated resources using an Additive Strategy.
+
+#### [MODIFY] `fetcher.rb`
+
+- **Additive Discovery**: In `fetch_plugin`:
+  - **Logic**:
+    1. **Check Manifest**: Look for `skills` field in `plugin` object (string or array).
+    2. **If Present**: Recursively fetch all files in those specific paths.
+    3. **If Absent**: Fallback to scanning the default `skills/` directory (recursively).
+    4. **Other Components**: Continue scanning for `commands/`, `agents/`, `hooks/` as before.
+
+- **Support Resource Types**:
+  - `skills`: Fetch `SKILL.md` AND recursively fetch `scripts/` directories if found within the skill path.
+
+  - `hooks`: Fetch the `hooks/hooks.json` file (or inline config).
+  - `commands`: Fetch markdown files.
+  - `agents`: Fetch markdown files.
+
+### 2. Adapter Architecture Refactor (`lib/caruso/`)
+
+Refactor the monolithic Adapter class into a dispatcher with specialized strategies.
+
+#### [MODIFY] `adapter.rb`
+Change `Adapter#adapt` to identify the component type and delegate to the appropriate sub-adapter.
+
+#### [NEW] `adapters/base.rb`
+Shared logic for file writing, frontmatter injection, and path sanitization.
+
+#### [NEW] `adapters/skill_adapter.rb`
+**Input:** `skills/<name>/SKILL.md` + `skills/<name>/scripts/*`
+**Output:**
+- `.cursor/rules/caruso/<marketplace>/<skill>/<skill>.mdc` (The rule)
+- `.cursor/scripts/caruso/<marketplace>/<skill>/*` (The scripts)
+
+**Logic:**
+1. Copy scripts to `.cursor/scripts/caruso/<marketplace>/<skill>/`.
+2. Ensure scripts are executable (`chmod +x`).
+3. **Paths:** Do NOT rewrite paths in the markdown (to avoid messiness).
+4. **Context:** Inject a location hint into the Rule's frontmatter `description` or prepended content:
+   ```yaml
+   description: Imported from <skill>. Scripts located at: .cursor/scripts/caruso/<marketplace>/<skill>/
+   ```
+
+#### [NEW] `adapters/agent_adapter.rb`
+**Input:** `agents/<name>.md`
+**Output:** `.cursor/rules/caruso/<marketplace>/agents/<name>.mdc`
+**Logic:**
+- Copy content.
+- Wrap as a "Persona" rule if needed, or simple markdown rule.
+
+#### [NEW] `adapters/command_adapter.rb`
+**Input:** `commands/<name>.md`
+**Output:** `.cursor/commands/<name>.md`
+**Logic:**
+- Basic markdown copy.
+- Frontmatter cleanup (remove Claude-specific fields if necessary).
+
+#### [NEW] `adapters/hook_adapter.rb`
+**Input:** `hooks/hooks.json`
+**Output:** Merged/Updated `.cursor/hooks.json`
+**Logic:**
+- Parse source JSON.
+- Map events (e.g., `PostToolUse` -> `afterFileEdit`).
+- Write/Merge into project's `hooks.json`.
+
+### 3. CLI Updates (`lib/caruso/cli.rb`)
+
+#### [MODIFY] `cli.rb`
+- Update `install` command to handle multiple file types returned by the upgraded fetcher.
+- Ensure `uninstall` cleans up the directories (scripts, etc) correctly.
+
+## Verification Plan
+
+### Automated Tests
+- **Fetcher Tests**: Mock a plugin structure with `scripts/` and verify they are returned in the file list.
+- **Adapter Tests**:
+  - Feed a `SKILL.md` + script to `SkillAdapter` and verify output structure and chmod.
+  - Feed a `hooks.json` and verify the event translation.
+
+### Manual Verification
+- **Skills**: Install a plugin with a script (e.g., a "linter" skill).
+  - Verify file exists at `.cursor/scripts/.../lint.sh`.
+  - Verify it is executable.
+  - Verify the Rule markdown is present.
+- **Commands**: Install a command plugin.
+  - Verify file exists at `.cursor/commands/...`.
+  - Test running the command in Cursor (Cmd+K `/command`).
+- **Hooks**: Install a hook plugin.
+  - Check `.cursor/hooks.json` contains the mapped event.

data/lib/caruso/adapter.rb

@@ -1,113 +1,26 @@
 # frozen_string_literal: true
 
-require "fileutils"
-require "yaml"
-require_relative "safe_file"
-require_relative "path_sanitizer"
+require_relative "adapters/dispatcher"
 
 module Caruso
   class Adapter
-    attr_reader :files, :target_dir, :agent, :marketplace_name, :plugin_name
-
+    # Preserving the interface for CLI compatibility
     def initialize(files, target_dir:, marketplace_name:, plugin_name:, agent: :cursor)
       @files = files
       @target_dir = target_dir
-      @agent = agent
       @marketplace_name = marketplace_name
       @plugin_name = plugin_name
-      FileUtils.mkdir_p(@target_dir)
+      @agent = agent
     end
 
     def adapt
-      created_files = []
-      files.each do |file_path|
-        content = SafeFile.read(file_path)
-
-        adapted_content = inject_metadata(content, file_path)
-        created_file = save_file(file_path, adapted_content)
-        created_files << created_file
-      end
-      created_files
-    end
-
-    private
-
-    def inject_metadata(content, file_path)
-      # Check if frontmatter exists
-      if content.match?(/\A---\s*\n.*?\n---\s*\n/m)
-        # If it exists, we might need to append to it or modify it
-        # For now, we assume existing frontmatter is "good enough" but might need 'globs' for Cursor
-        ensure_cursor_globs(content) if agent == :cursor
-      else
-        # No frontmatter, prepend it
-        create_frontmatter(file_path) + content
-      end
-    end
-
-    def ensure_cursor_globs(content)
-      # Add required Cursor metadata fields if missing
-      # globs: [] enables semantic search (Apply Intelligently)
-      # alwaysApply: false means it won't apply to every chat session
-
-      unless content.include?("globs:")
-        content.sub!(/\A---\s*\n/, "---\nglobs: []\n")
-      end
-
-      unless content.include?("alwaysApply:")
-        # Add after the first line of frontmatter
-        content.sub!(/\A---\s*\n/, "---\nalwaysApply: false\n")
-      end
-
-      content
-    end
-
-    def create_frontmatter(file_path)
-      filename = File.basename(file_path)
-      <<~YAML
-        ---
-        description: Imported rule from #{filename}
-        globs: []
-        alwaysApply: false
-        ---
-      YAML
-    end
-
-    def save_file(original_path, content)
-      filename = File.basename(original_path, ".*")
-
-      # Rename SKILL.md to the skill name (parent directory) to avoid collisions
-      if filename.casecmp("skill").zero?
-        filename = File.basename(File.dirname(original_path))
-      end
-
-      extension = agent == :cursor ? ".mdc" : ".md"
-      output_filename = "#{filename}#{extension}"
-
-      # Extract component type from original path (commands/agents/skills)
-      component_type = extract_component_type(original_path)
-
-      # Build nested directory structure for Cursor
-      # Build nested directory structure for Cursor
-      # Structure: .cursor/rules/caruso/marketplace/plugin/component-type/file.mdc
-      subdirs = File.join("caruso", marketplace_name, plugin_name, component_type)
-      output_dir = File.join(@target_dir, subdirs)
-      FileUtils.mkdir_p(output_dir)
-      target_path = File.join(output_dir, output_filename)
-
-      File.write(target_path, content)
-      puts "Saved: #{target_path}"
-
-      # Return relative path from target_dir
-      File.join(subdirs, output_filename)
-    end
-
-    def extract_component_type(file_path)
-      # Extract component type (commands/agents/skills) from path
-      return "commands" if file_path.include?("/commands/")
-      return "agents" if file_path.include?("/agents/")
-      return "skills" if file_path.include?("/skills/")
-
-      raise Caruso::Error, "Cannot determine component type from path: #{file_path}"
+      Caruso::Adapters::Dispatcher.adapt(
+        @files,
+        target_dir: @target_dir,
+        marketplace_name: @marketplace_name,
+        plugin_name: @plugin_name,
+        agent: @agent
+      )
     end
   end
 end

data/lib/caruso/adapters/base.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "yaml"
+require_relative "../safe_file"
+require_relative "../path_sanitizer"
+
+module Caruso
+  module Adapters
+    class Base
+      attr_reader :files, :target_dir, :agent, :marketplace_name, :plugin_name
+
+      def initialize(files, target_dir:, marketplace_name:, plugin_name:, agent: :cursor)
+        @files = files
+        @target_dir = target_dir
+        @agent = agent
+        @marketplace_name = marketplace_name
+        @plugin_name = plugin_name
+        FileUtils.mkdir_p(@target_dir)
+      end
+
+      def adapt
+        raise NotImplementedError, "#{self.class.name}#adapt must be implemented"
+      end
+
+      protected
+
+      def save_file(relative_path, content, extension: nil)
+        filename = File.basename(relative_path, ".*")
+        
+        # Preserve original extension if none provided
+        ext = extension || File.extname(relative_path)
+        
+        # Rename SKILL.md to the skill name (parent directory) to avoid collisions
+        # This is specific to Skills, might move to SkillAdapter later, but keeping behavior for now
+        if filename.casecmp("skill").zero?
+          filename = File.basename(File.dirname(relative_path))
+        end
+
+        output_filename = "#{filename}#{ext}"
+
+        # Build nested directory structure: .cursor/rules/caruso/marketplace/plugin/component/file
+        # Component type is derived from the class name or passed in?
+        # For base, we might need a way to determine output path more flexibly.
+        # But sticking to current behavior:
+        
+        component_type = extract_component_type(relative_path)
+        subdirs = File.join("caruso", marketplace_name, plugin_name, component_type)
+        output_dir = File.join(target_dir, subdirs)
+        
+        FileUtils.mkdir_p(output_dir)
+        target_path = File.join(output_dir, output_filename)
+
+        File.write(target_path, content)
+        puts "Saved: #{target_path}"
+
+        File.join(subdirs, output_filename)
+      end
+
+      def extract_component_type(file_path)
+        # Extract component type (commands/agents/skills) from path
+        return "commands" if file_path.include?("/commands/")
+        return "agents" if file_path.include?("/agents/")
+        return "skills" if file_path.include?("/skills/")
+        
+        # Fallback or specific handling for other types
+        "misc"
+      end
+
+      def inject_metadata(content, file_path)
+        if content.match?(/\A---\s*\n.*?\n---\s*\n/m)
+          ensure_cursor_globs(content) if agent == :cursor
+        else
+          create_frontmatter(file_path) + content
+        end
+      end
+
+      def ensure_cursor_globs(content)
+        unless content.include?("globs:")
+          content.sub!(/\A---\s*\n/, "---\nglobs: []\n")
+        end
+
+        unless content.include?("alwaysApply:")
+          content.sub!(/\A---\s*\n/, "---\nalwaysApply: false\n")
+        end
+
+        content
+      end
+
+      def create_frontmatter(file_path)
+        filename = File.basename(file_path)
+        <<~YAML
+          ---
+          description: Imported rule from #{filename}
+          globs: []
+          alwaysApply: false
+          ---
+        YAML
+      end
+    end
+  end
+end

data/lib/caruso/adapters/dispatcher.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative "markdown_adapter"
+require_relative "skill_adapter"
+
+module Caruso
+  module Adapters
+    class Dispatcher
+      def self.adapt(files, target_dir:, marketplace_name:, plugin_name:, agent: :cursor)
+        created_files = []
+        remaining_files = files.dup
+
+        # 1. Identify and Process Skill Clusters
+        # Find all SKILL.md files to serve as anchors
+        skill_anchors = remaining_files.select { |f| File.basename(f).casecmp("skill.md").zero? }
+
+        skill_anchors.each do |anchor|
+          skill_dir = File.dirname(anchor)
+          
+          # Find all files that belong to this skill's directory (recursive)
+          skill_cluster = remaining_files.select { |f| f.start_with?(skill_dir) }
+          
+          # Use SkillAdapter for this cluster
+          adapter = SkillAdapter.new(
+            skill_cluster,
+            target_dir: target_dir,
+            marketplace_name: marketplace_name,
+            plugin_name: plugin_name,
+            agent: agent
+          )
+          created_files.concat(adapter.adapt)
+          
+          # Remove processed files
+          remaining_files -= skill_cluster
+        end
+
+        # 2. Process Remaining Files (Commands, Agents, etc.) via MarkdownAdapter
+        if remaining_files.any?
+          adapter = MarkdownAdapter.new(
+            remaining_files,
+            target_dir: target_dir,
+            marketplace_name: marketplace_name,
+            plugin_name: plugin_name,
+            agent: agent
+          )
+          created_files.concat(adapter.adapt)
+        end
+
+        created_files
+      end
+    end
+  end
+end

data/lib/caruso/adapters/markdown_adapter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Caruso
+  module Adapters
+    class MarkdownAdapter < Base
+      def adapt
+        created_files = []
+        files.each do |file_path|
+          content = SafeFile.read(file_path)
+          adapted_content = inject_metadata(content, file_path)
+          
+          extension = agent == :cursor ? ".mdc" : ".md"
+          created_file = save_file(file_path, adapted_content, extension: extension)
+          
+          created_files << created_file
+        end
+        created_files
+      end
+    end
+  end
+end

data/lib/caruso/adapters/skill_adapter.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Caruso
+  module Adapters
+    class SkillAdapter < Base
+      def adapt
+        created_files = []
+        
+        # Separate SKILL.md from other files (scripts, etc.)
+        skill_file = files.find { |f| File.basename(f).casecmp("skill.md").zero? }
+        other_files = files - [skill_file]
+
+        if skill_file
+          skill_root = File.dirname(skill_file)
+          skill_name = File.basename(skill_root)
+          
+          # Inject script location hint
+          # Targeted script location: .cursor/scripts/caruso/<market>/<plugin>/<skill_name>/
+          script_location = ".cursor/scripts/caruso/#{marketplace_name}/#{plugin_name}/#{skill_name}/"
+          
+          content = SafeFile.read(skill_file)
+          adapted_content = inject_skill_metadata(content, skill_file, script_location)
+          
+          # Save as Rule (.mdc)
+          extension = agent == :cursor ? ".mdc" : ".md"
+          created_file = save_file(skill_file, adapted_content, extension: extension)
+          created_files << created_file
+          
+          # Process Scripts/Assets -> .cursor/scripts/...
+          other_files.each do |file_path|
+            # Calculate path relative to the skill root
+            # e.g. source: .../skills/auth/scripts/login.sh
+            #      root:   .../skills/auth
+            #      rel:    scripts/login.sh
+            relative_path_from_root = file_path.sub(skill_root + "/", "")
+            
+            created_script = save_script(file_path, skill_name, relative_path_from_root)
+            created_files << created_script
+          end
+        end
+
+        created_files
+      end
+
+      private
+
+      def inject_skill_metadata(content, file_path, script_location)
+        # Inject script location into description
+        hint = "Scripts located at: #{script_location}"
+        
+        if content.match?(/\A---\s*\n.*?\n---\s*\n/m)
+          # Update existing frontmatter
+          content.sub!(/^description: (.*)$/, "description: \\1. #{hint}")
+          ensure_cursor_globs(content)
+        else
+          # Create new frontmatter with hint
+          create_skill_frontmatter(file_path, hint) + content
+        end
+      end
+
+      def create_skill_frontmatter(file_path, hint)
+        filename = File.basename(file_path)
+        <<~YAML
+          ---
+          description: Imported skill from #{filename}. #{hint}
+          globs: []
+          alwaysApply: false
+          ---
+        YAML
+      end
+
+      def save_script(source_path, skill_name, relative_sub_path)
+        # Construct target path in .cursor/scripts
+        # .cursor/scripts/caruso/<marketplace>/<plugin>/<skill_name>/<relative_sub_path>
+        
+        scripts_root = File.join(target_dir, "..", "scripts", "caruso", marketplace_name, plugin_name, skill_name)
+        # Note: target_dir passed to adapter is usually .cursor/rules.
+        # So .. -> .cursor -> scripts
+        
+        target_path = File.join(scripts_root, relative_sub_path)
+        output_dir = File.dirname(target_path)
+        
+        FileUtils.mkdir_p(output_dir)
+        FileUtils.cp(source_path, target_path)
+        
+        # Make executable
+        File.chmod(0755, target_path)
+        
+        puts "Saved script: #{target_path}"
+        
+        # Return relative path for tracking/reporting
+        # We start from .cursor (parent of target_dir) ideally?
+        # Or just return the absolute path for now?
+        target_path
+      end
+    end
+  end
+end

data/lib/caruso/cli.rb

@@ -51,27 +51,30 @@ module Caruso
       end
     end
 
-    desc "remove NAME", "Remove a marketplace"
-    def remove(name)
+    desc "remove NAME_OR_URL", "Remove a marketplace"
+    def remove(name_or_url)
       config_manager = load_config
+      marketplaces = config_manager.list_marketplaces
 
-      # Remove from config
-      config_manager.remove_marketplace(name)
-
-      # Remove from registry
-      registry = Caruso::MarketplaceRegistry.new
-      marketplace = registry.get_marketplace(name)
-      if marketplace
-        cache_dir = marketplace["install_location"]
-        registry.remove_marketplace(name)
-
-        # Inform about cache directory
-        if Dir.exist?(cache_dir)
-          puts "Cache directory still exists at: #{cache_dir}"
-          puts "Run 'rm -rf #{cache_dir}' to delete it if desired."
+      # Try to find by name first
+      if marketplaces.key?(name_or_url)
+        name = name_or_url
+      else
+        # Try to find by URL
+        # We need to check exact match or maybe normalized match
+        match = marketplaces.find { |_, details| details["url"] == name_or_url || details["url"].chomp(".git") == name_or_url }
+        if match
+          name = match[0]
+        else
+          puts "Marketplace '#{name_or_url}' not found."
+          return
         end
       end
 
+      # Use Remover to handle cleanup
+      remover = Caruso::Remover.new(config_manager)
+      remover.remove_marketplace(name)
+
       puts "Removed marketplace '#{name}'"
     end
 
@@ -260,15 +263,9 @@ module Caruso
       end
 
       puts "Removing #{plugin_key}..."
-      files_to_remove = config_manager.remove_plugin(plugin_key)
 
-      files_to_remove.each do |file|
-        full_path = File.join(config_manager.project_dir, file)
-        if File.exist?(full_path)
-          File.delete(full_path)
-          puts "  Deleted #{file}"
-        end
-      end
+      remover = Caruso::Remover.new(config_manager)
+      remover.remove_plugin(plugin_key)
 
       puts "Uninstalled #{plugin_key}."
     end

data/lib/caruso/config_manager.rb

@@ -150,6 +150,23 @@ module Caruso
       save_project_config(data)
     end
 
+    def remove_marketplace_with_plugins(marketplace_name)
+      files_to_remove = []
+
+      # Find and remove all plugins associated with this marketplace
+      installed_plugins = list_plugins
+      installed_plugins.each do |plugin_key, details|
+        if details["marketplace"] == marketplace_name
+          files_to_remove.concat(remove_plugin(plugin_key))
+        end
+      end
+
+      # Remove the marketplace itself
+      remove_marketplace(marketplace_name)
+
+      files_to_remove.uniq
+    end
+
     def list_marketplaces
       load_project_config["marketplaces"] || {}
     end