schwarm-cli 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce993c4ccb8c15a7a2743ef5d28c8f2c06e3513dad637c23ad0f7929e3dc8b5
-  data.tar.gz: add9e02c84c8b0bb05d96c34c0b07b68210669449bb0c428cda290b4559137a4
+  metadata.gz: 6eb34f4bf3e7d00ae361c8f3e2e92543b70a3cf607bca49c2621db6308ff7347
+  data.tar.gz: '081ef605e386eef7aa68d0f41646a16c270cf5760bfeb1b5f7270f4b3b5ecf7e'
 SHA512:
-  metadata.gz: 54bde32d06880389d77bf624a431c4f702f58fefd6d97067f0f4b6e042ab4bd6fba7e64f3399a16e19e0a4fb1473580c68f45998ae8248cb9ca8a08d3c5ea327
-  data.tar.gz: f2a4b9dd8b1b2061c3dc7d9512b2889e260abce55c640b8f5638caded2c790c0db5f03753a895a418a9075c54a41dc69050f1af09b89750e167e187036742cf2
+  metadata.gz: 259bfe442c01d5d6a7906fcbf474927013374d8283f7083552b5e30137603e94ae94d2f92c3211c173807236d37b188de25e45594179c108fb49562af521a903
+  data.tar.gz: 118a0a5418bd88cc5f17e6f06bd80221830fdc2d8b5a4e9a83276894cd64779bdc1b9015012f5e5f1068ee1805800260f8f9dbafbde9327247bf1853cd78b0d6

data/lib/schwarm_cli/client/secret_files.rb

@@ -3,8 +3,8 @@
 module SchwarmCli
   class Client
     class SecretFiles < Resource
-      def list(repository_id: nil, page: nil, per_page: nil)
-        params = { repository_id:, page:, per_page: }.compact
+      def list(repository_id: nil, query: nil, page: nil, per_page: nil)
+        params = { repository_id:, q: query, page:, per_page: }.compact
         get("/api/v2/secret_files", params).body
       end
 

data/lib/schwarm_cli/client/skill_files.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
+require "faraday/multipart"
+
 module SchwarmCli
   class Client
+    # The skill_files endpoint expects path as a top-level form param plus a
+    # multipart-attached `file` (Active Storage), NOT a JSON body wrapped in
+    # `{skill_file: {...}}`. Build a multipart form for create/update.
     class SkillFiles < Resource
       def list(skill_id:, page: nil, per_page: nil)
         params = { page:, per_page: }.compact
@@ -12,18 +17,34 @@ module SchwarmCli
         get("/api/v2/skills/#{skill_id}/files/#{id}").body
       end
 
-      def create(skill_id:, **attributes)
-        post("/api/v2/skills/#{skill_id}/files", { skill_file: attributes }).body
+      def create(skill_id:, path:, content:)
+        post("/api/v2/skills/#{skill_id}/files", multipart_body(path:, content:)).body
       end
 
-      def update(skill_id:, id:, **attributes)
-        patch("/api/v2/skills/#{skill_id}/files/#{id}", { skill_file: attributes }).body
+      def update(skill_id:, id:, path: nil, content: nil)
+        body = {}
+        body[:path] = path if path
+        body[:file] = file_part(path:, content:) if content
+        patch("/api/v2/skills/#{skill_id}/files/#{id}", body).body
       end
 
       def destroy(skill_id:, id:)
         delete("/api/v2/skills/#{skill_id}/files/#{id}")
         nil
       end
+
+      private
+
+      def multipart_body(path:, content:)
+        { path:, file: file_part(path:, content:) }
+      end
+
+      # Active Storage needs a real IO with a filename. Wrap the in-memory
+      # content in a StringIO and hand it to Faraday::Multipart::FilePart.
+      def file_part(path:, content:)
+        io = StringIO.new(content.to_s)
+        Faraday::Multipart::FilePart.new(io, "application/octet-stream", File.basename(path.to_s))
+      end
     end
   end
 end

data/lib/schwarm_cli/client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "faraday"
+require "faraday/multipart"
 require "faraday/net_http_persistent"
 require "faraday/retry"
 
@@ -62,6 +63,7 @@ module SchwarmCli
 
     def conn
       @conn ||= Faraday.new(url:, headers:, **faraday_options) do |f|
+        f.request :multipart
         f.request :json
         f.request :authorization, "Bearer", api_key
         f.request :retry, retry_options

data/lib/schwarm_cli/commands/agent_subscriptions.rb

@@ -38,8 +38,8 @@ module SchwarmCli
                      desc: "Agent ID to subscribe to this repository"
       option :additional_instructions, type: :string,
                                        desc: "Per-repository additional instructions appended to the shared prompt"
-      option :enabled, type: :boolean, default: true,
-                       desc: "Whether the subscription is active (default: true)"
+      option :enabled, type: :boolean, default: false,
+                       desc: "Whether the subscription is active (default: false; toggle to enable)"
       def create
         handle_errors do
           data = client.subscriptions.create(**create_attrs)

data/lib/schwarm_cli/commands/agents.rb

@@ -17,7 +17,7 @@ module SchwarmCli
             client.agents.list(query: options[:query], **page_params)
           end
           output_list(data, columns: [%w[ID id], %w[NAME name], %w[ENABLED enabled],
-                                      %w[SCHEDULE schedule]])
+                                      %w[SCHEDULE cron_expression]])
         end
       end
 
@@ -25,25 +25,25 @@ module SchwarmCli
       def show(id)
         handle_errors do
           data = client.agents.find(id)
-          output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Enabled" => "enabled",
-                          "Schedule" => "schedule", "Prompt" => "prompt",
-                          "Created" => "created_at", "Updated" => "updated_at"
-                        })
+          output_record(data, fields: agent_fields)
         end
       end
 
       desc "create", "Create an agent"
       option :name, type: :string, required: true, desc: "Agent name"
       option :prompt, type: :string, required: true, desc: "Agent prompt"
-      option :schedule, type: :string, desc: "Cron schedule"
+      option :schedule, type: :string, required: true, desc: "Cron schedule (e.g. \"0 0 * * *\")"
+      option :enabled, type: :boolean, default: false,
+                       desc: "Whether the agent runs (default: false; toggle to enable)"
       def create
         handle_errors do
-          attrs = { name: options[:name], prompt: options[:prompt] }
-          attrs[:schedule] = options[:schedule] if options[:schedule]
+          attrs = {
+            name: options[:name], prompt: options[:prompt],
+            cron_expression: options[:schedule], enabled: options[:enabled]
+          }
 
           data = client.agents.create(**attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Enabled" => "enabled" })
+          output_record(data, fields: agent_fields)
         end
       end
 
@@ -54,7 +54,7 @@ module SchwarmCli
       def update(id)
         handle_errors do
           data = client.agents.update(id, **update_attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Enabled" => "enabled" })
+          output_record(data, fields: agent_fields)
         end
       end
 
@@ -81,9 +81,17 @@ module SchwarmCli
         {}.tap do |attrs|
           attrs[:name] = options[:name] if options[:name]
           attrs[:prompt] = options[:prompt] if options[:prompt]
-          attrs[:schedule] = options[:schedule] if options[:schedule]
+          attrs[:cron_expression] = options[:schedule] if options[:schedule]
         end
       end
+
+      def agent_fields
+        {
+          "ID" => "id", "Name" => "name", "Enabled" => "enabled",
+          "Schedule" => "cron_expression", "Prompt" => "prompt",
+          "Created" => "created_at", "Updated" => "updated_at"
+        }
+      end
     end
   end
 end

data/lib/schwarm_cli/commands/base.rb

@@ -5,12 +5,39 @@ require "thor"
 module SchwarmCli
   module Commands
     class Base < Thor
-      class_option :json, type: :boolean, default: false, desc: "Output as JSON"
+      # No `default: false` on :json — we need to distinguish "not provided"
+      # (nil) from "explicitly negated" (--no-json => false) so nested
+      # subcommands can opt out of an inherited --json (see options below).
+      class_option :json, type: :boolean, desc: "Output as JSON"
       class_option :url, type: :string, desc: "Schwarm server URL (overrides config)"
       class_option :token, type: :string, desc: "API key (overrides config)"
 
       def self.exit_on_failure? = true
 
+      # Thor parses class_options at each subcommand level independently, so
+      # `--json` at a doubly-nested invocation (`agents subscriptions list
+      # --json`) is consumed by the outer class and never reaches the inner.
+      # Merge parent_options for global flags (json, url, token) so they
+      # propagate transparently into nested subcommands.
+      #
+      # We can't use Hash#merge with a block because Thor returns a
+      # HashWithIndifferentAccess whose `merge` ignores the block argument
+      # (lib/thor/core_ext/hash_with_indifferent_access.rb:53). Walk the
+      # inherited keys explicitly so an explicit child value (including
+      # `false` from --no-json) wins over an inherited parent value.
+      INHERITED_OPTIONS = %w[json url token].freeze
+
+      no_commands do
+        def options
+          merged = super.dup
+          parent = parent_options || {}
+          INHERITED_OPTIONS.each do |key|
+            merged[key] = parent[key] if merged[key].nil? && !parent[key].nil?
+          end
+          merged
+        end
+      end
+
       DEFAULT_LIST_LIMIT = 20
 
       # Declares --limit, --page, --all options for the next method.

data/lib/schwarm_cli/commands/recurring.rb

@@ -21,11 +21,7 @@ module SchwarmCli
       def show(id)
         handle_errors do
           data = client.recurring.find(id)
-          output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Repository" => "github_repository_id",
-                          "Enabled" => "enabled", "Schedule" => "cron_expression", "Prompt" => "prompt",
-                          "Created" => "created_at", "Updated" => "updated_at"
-                        })
+          output_record(data, fields: recurring_fields)
         end
       end
 
@@ -34,15 +30,12 @@ module SchwarmCli
       option :repo, type: :string, required: true, desc: "Repository ID, owner/repo, or GitHub URL"
       option :prompt, type: :string, required: true, desc: "Task prompt"
       option :schedule, type: :string, required: true, desc: "Cron schedule"
+      option :enabled, type: :boolean, default: false,
+                       desc: "Whether the recurring task fires (default: false; toggle to enable)"
       def create
         handle_errors do
-          attrs = {
-            name: options[:name], github_repository_id: resolve_repo(options[:repo]),
-            prompt: options[:prompt], cron_expression: options[:schedule]
-          }
-
-          data = client.recurring.create(**attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Schedule" => "cron_expression" })
+          data = client.recurring.create(**create_attrs)
+          output_record(data, fields: recurring_fields)
         end
       end
 
@@ -53,7 +46,7 @@ module SchwarmCli
       def update(id)
         handle_errors do
           data = client.recurring.update(id, **update_attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Schedule" => "cron_expression" })
+          output_record(data, fields: recurring_fields)
         end
       end
 
@@ -76,6 +69,20 @@ module SchwarmCli
 
       private
 
+      def create_attrs
+        {
+          name: options[:name], github_repository_id: resolve_repo(options[:repo]),
+          prompt: options[:prompt], cron_expression: options[:schedule],
+          enabled: options[:enabled]
+        }
+      end
+
+      def recurring_fields
+        { "ID" => "id", "Name" => "name", "Repository" => "github_repository_id",
+          "Enabled" => "enabled", "Schedule" => "cron_expression", "Prompt" => "prompt",
+          "Created" => "created_at", "Updated" => "updated_at" }
+      end
+
       def update_attrs
         {}.tap do |attrs|
           attrs[:name] = options[:name] if options[:name]

data/lib/schwarm_cli/commands/repo_skills.rb

@@ -23,10 +23,7 @@ module SchwarmCli
       def show(id)
         handle_errors do
           data = client.repo_skills.find(id)
-          output_record(data, fields: {
-                          "ID" => "id", "Repository" => "github_repository_id",
-                          "Skill" => "skill_id", "Created" => "created_at"
-                        })
+          output_record(data, fields: repo_skill_fields)
         end
       end
 
@@ -38,8 +35,7 @@ module SchwarmCli
           data = client.repo_skills.create(
             github_repository_id: resolve_repo(options[:repo]), skill_id: options[:skill]
           )
-          output_record(data, fields: { "ID" => "id", "Repository" => "github_repository_id",
-                                        "Skill" => "skill_id" })
+          output_record(data, fields: repo_skill_fields)
         end
       end
 
@@ -50,6 +46,13 @@ module SchwarmCli
           puts "Repository-skill association #{id} deleted."
         end
       end
+
+      private
+
+      def repo_skill_fields
+        { "ID" => "id", "Repository" => "github_repository_name",
+          "Skill" => "skill_name", "Created" => "created_at" }
+      end
     end
   end
 end

data/lib/schwarm_cli/commands/secrets.rb

@@ -5,11 +5,14 @@ module SchwarmCli
     class Secrets < Base
       desc "list", "List secret files"
       option :repo, type: :string, desc: "Filter by repository ID, owner/repo, or GitHub URL"
+      option :query, type: :string, desc: "Search by path"
       pagination_options
       def list
         handle_errors do
           data = fetch_paged do |page_params|
-            client.secrets.list(repository_id: resolve_repo(options[:repo]), **page_params)
+            client.secrets.list(
+              repository_id: resolve_repo(options[:repo]), query: options[:query], **page_params
+            )
           end
           output_list(data, columns: [%w[ID id], %w[REPO github_repository_name], %w[PATH path]])
         end

data/lib/schwarm_cli/commands/skill_files.rb

@@ -3,9 +3,8 @@
 module SchwarmCli
   module Commands
     class SkillFilesCmd < Base
-      class_option :skill, type: :string, required: true, desc: "Skill ID"
-
       desc "list", "List skill files"
+      option :skill, type: :string, required: true, desc: "Skill ID"
       pagination_options
       def list
         handle_errors do
@@ -17,39 +16,46 @@ module SchwarmCli
       end
 
       desc "show ID", "Show skill file details"
+      option :skill, type: :string, required: true, desc: "Skill ID"
       def show(id)
         handle_errors do
           data = client.skill_files.find(skill_id: options[:skill], id:)
-          output_record(data, fields: {
-                          "ID" => "id", "Path" => "path", "Content" => "content", "Created" => "created_at"
-                        })
+          output_record(data, fields: skill_file_fields)
         end
       end
 
       desc "create", "Create a skill file"
-      option :path, type: :string, required: true, desc: "File path"
-      option :content, type: :string, desc: "File content"
-      option :file, type: :string, desc: "Read content from file"
+      option :skill, type: :string, required: true, desc: "Skill ID"
+      option :path, type: :string, required: true, desc: "File path within the skill (e.g. SKILL.md)"
+      option :content, type: :string, desc: "File content (mutually exclusive with --file)"
+      option :file, type: :string, desc: "Read content from file (mutually exclusive with --content)"
       def create
         handle_errors do
-          content = read_content
-          data = client.skill_files.create(skill_id: options[:skill], path: options[:path], content:)
-          output_record(data, fields: { "ID" => "id", "Path" => "path" })
+          data = client.skill_files.create(
+            skill_id: options[:skill], path: options[:path],
+            content: read_content(required: true)
+          )
+          output_record(data, fields: skill_file_fields)
         end
       end
 
       desc "update ID", "Update a skill file"
+      option :skill, type: :string, required: true, desc: "Skill ID"
       option :path, type: :string, desc: "File path"
-      option :content, type: :string, desc: "File content"
-      option :file, type: :string, desc: "Read content from file"
+      option :content, type: :string, desc: "File content (mutually exclusive with --file)"
+      option :file, type: :string, desc: "Read content from file (mutually exclusive with --content)"
       def update(id)
         handle_errors do
-          data = client.skill_files.update(skill_id: options[:skill], id:, **update_attrs)
-          output_record(data, fields: { "ID" => "id", "Path" => "path" })
+          data = client.skill_files.update(
+            skill_id: options[:skill], id:,
+            path: options[:path], content: read_content(required: false)
+          )
+          output_record(data, fields: skill_file_fields)
         end
       end
 
       desc "delete ID", "Delete a skill file"
+      option :skill, type: :string, required: true, desc: "Skill ID"
       def delete(id)
         handle_errors do
           client.skill_files.destroy(skill_id: options[:skill], id:)
@@ -59,21 +65,23 @@ module SchwarmCli
 
       private
 
-      def update_attrs
-        {}.tap do |attrs|
-          attrs[:path] = options[:path] if options[:path]
-          attrs[:content] = read_content if options[:content] || options[:file]
-        end
+      def skill_file_fields
+        { "ID" => "id", "Path" => "path", "Skill" => "skill_id",
+          "Created" => "created_at", "Updated" => "updated_at" }
       end
 
-      def read_content
-        if options[:file]
-          file_path = File.expand_path(options[:file])
-          abort "Error: File not found: #{file_path}" unless File.exist?(file_path)
-          File.read(file_path)
-        else
-          options[:content]
-        end
+      def read_content(required:)
+        abort "Error: --content and --file are mutually exclusive." if options[:content] && options[:file]
+        return options[:content] if options[:content]
+        return read_file(options[:file]) if options[:file]
+
+        abort "Error: one of --content or --file is required." if required
+      end
+
+      def read_file(path)
+        expanded = File.expand_path(path)
+        abort "Error: File not found: #{expanded}" unless File.exist?(expanded)
+        File.read(expanded)
       end
     end
   end

data/lib/schwarm_cli/commands/templates.rb

@@ -19,10 +19,7 @@ module SchwarmCli
       def show(id)
         handle_errors do
           data = client.templates.find(id)
-          output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Description" => "description",
-                          "Prompt" => "prompt_prefix", "Created" => "created_at"
-                        })
+          output_record(data, fields: template_fields)
         end
       end
 
@@ -36,7 +33,7 @@ module SchwarmCli
           attrs[:description] = options[:description] if options[:description]
 
           data = client.templates.create(**attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name" })
+          output_record(data, fields: template_fields)
         end
       end
 
@@ -47,7 +44,7 @@ module SchwarmCli
       def update(id)
         handle_errors do
           data = client.templates.update(id, **update_attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name" })
+          output_record(data, fields: template_fields)
         end
       end
 
@@ -61,6 +58,11 @@ module SchwarmCli
 
       private
 
+      def template_fields
+        { "ID" => "id", "Name" => "name", "Description" => "description",
+          "Prompt" => "prompt_prefix", "Created" => "created_at", "Updated" => "updated_at" }
+      end
+
       def update_attrs
         {}.tap do |attrs|
           attrs[:name] = options[:name] if options[:name]

data/lib/schwarm_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchwarmCli
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schwarm-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Vincent Garrigues
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday-net_http_persistent
   requirement: !ruby/object:Gem::Requirement