schwarm-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb4e9030ccc6a70a2d35c94e5c2db414bae4b56550ae21128b2e3f612b56b6cf
-  data.tar.gz: 4c4bfd79d9b120f01764b4b482200757a5a3f4d1a1e8dba5c344486befebf48d
+  metadata.gz: 601a7ca203a5837a47d4bd0348300054e07fe3577a57c99865a64c282e310d8f
+  data.tar.gz: 857487dd8fa4d92e575466ebe1ed63c70fd3b1c744c6b041eb3d4c675c4657fc
 SHA512:
-  metadata.gz: 326c318ea026081fb23c05cd552e5a78204af6f35dc96e2ff7d5da6c838d0b48646534ab914cc1bc6afa250844e6a6d2ab3895cf2da37fee44f671308c10fbc4
-  data.tar.gz: c15ba6b8d00b97e44e8b0642ab88753423043cbb4eafad9593fc8fdba0a22bc3a67168576fe76f5165386316bfe14e505411471d08dca4eb6e474ddea25a9d97
+  metadata.gz: 899c50f55a6b91d9a8690603de5cbf7dc429b022f18198d205c3679eb6a97911e1fb5afe6bc96cb8ae76f852bb38edf9ca7ef82df245249e5ef1fc5e8188ccc9
+  data.tar.gz: 506dd09f7f837606a154cd61f0e2f79e7b231af0daa1e495115ba16b2e7c6fc5290dc101fd0c30ca8370132bc08178e39158295100a68c3a36a0e21e2079ca58

data/lib/schwarm_cli/commands/agents.rb

@@ -22,18 +22,23 @@ module SchwarmCli
         handle_errors do
           data = client.agents.find(id)
           output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Repository" => "github_repository_id",
-                          "Enabled" => "enabled", "Schedule" => "schedule", "Prompt" => "prompt",
+                          "ID" => "id", "Name" => "name", "Repository" => "github_repository_name",
+                          "Shared Agent" => "shared_agent_id", "Enabled" => "enabled",
+                          "Schedule" => "schedule",
+                          "Additional Instructions" => "additional_instructions",
                           "Created" => "created_at", "Updated" => "updated_at"
                         })
         end
       end
 
-      desc "create", "Create a repository agent"
-      option :name, type: :string, required: true, desc: "Agent name"
+      desc "create", "Create a repository agent (subscribe a shared agent to a repo)"
       option :repo, type: :string, required: true, desc: "Repository ID, owner/repo, or GitHub URL"
-      option :prompt, type: :string, required: true, desc: "Agent prompt"
-      option :schedule, type: :string, desc: "Cron schedule"
+      option :shared_agent, type: :string, required: true,
+                            desc: "Shared 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 agent runs (default: true)"
       def create
         handle_errors do
           data = client.agents.create(**create_attrs)
@@ -42,9 +47,9 @@ module SchwarmCli
       end
 
       desc "update ID", "Update a repository agent"
-      option :name, type: :string, desc: "Agent name"
-      option :prompt, type: :string, desc: "Agent prompt"
-      option :schedule, type: :string, desc: "Cron schedule"
+      option :additional_instructions, type: :string,
+                                       desc: "Per-repository additional instructions"
+      option :enabled, type: :boolean, desc: "Whether the agent runs"
       def update(id)
         handle_errors do
           data = client.agents.update(id, **update_attrs)
@@ -82,18 +87,18 @@ module SchwarmCli
 
       def create_attrs
         attrs = {
-          name: options[:name], github_repository_id: resolve_repo(options[:repo]),
-          prompt: options[:prompt]
+          shared_agent_id: options[:shared_agent],
+          github_repository_id: resolve_repo(options[:repo]),
+          enabled: options[:enabled]
         }
-        attrs[:schedule] = options[:schedule] if options[:schedule]
+        attrs[:additional_instructions] = options[:additional_instructions] if options[:additional_instructions]
         attrs
       end
 
       def update_attrs
         {}.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[:additional_instructions] = options[:additional_instructions] if options[:additional_instructions]
+          attrs[:enabled] = options[:enabled] unless options[:enabled].nil?
         end
       end
     end

data/lib/schwarm_cli/commands/base.rb

@@ -9,6 +9,8 @@ module SchwarmCli
       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
+
       DEFAULT_LIST_LIMIT = 20
 
       # Declares --limit, --page, --all options for the next method.
@@ -87,12 +89,12 @@ module SchwarmCli
         yield
       rescue Faraday::UnauthorizedError
         abort "Error: Unauthorized. Check your API key or run `schwarm configure`."
-      rescue Faraday::ResourceNotFound
-        abort "Error: Not found."
+      rescue Faraday::ResourceNotFound => e
+        abort "Error: #{parse_error_body(e, fallback: 'Not found.')}"
       rescue Faraday::UnprocessableEntityError => e
-        abort "Error: #{parse_error_body(e)}"
+        abort "Error: #{parse_error_body(e, fallback: 'Validation failed')}"
       rescue Faraday::ClientError => e
-        abort "Error: #{e.message}"
+        abort "Error: #{parse_error_body(e, fallback: e.message)}"
       rescue Faraday::ServerError
         abort "Error: Server error. Try again later."
       rescue Faraday::ConnectionFailed
@@ -101,14 +103,14 @@ module SchwarmCli
         abort "Error: Request timed out."
       end
 
-      def parse_error_body(error)
+      def parse_error_body(error, fallback:)
         body = error.response&.dig(:body)
-        return "Validation failed" unless body.is_a?(String)
+        return fallback unless body.is_a?(String) && !body.empty?
 
         parsed = JSON.parse(body)
-        parsed.dig("error", "message") || "Validation failed"
+        parsed.dig("error", "message") || fallback
       rescue JSON::ParserError
-        "Validation failed"
+        fallback
       end
     end
   end

data/lib/schwarm_cli/commands/main.rb

@@ -17,6 +17,8 @@ require_relative "configure"
 module SchwarmCli
   module Commands
     class Main < Thor
+      def self.exit_on_failure? = true
+
       desc "tasks SUBCOMMAND", "Manage tasks"
       subcommand "tasks", Tasks
 
@@ -30,13 +32,13 @@ module SchwarmCli
       subcommand "skills", SkillsCmd
 
       desc "skill-files SUBCOMMAND", "Manage skill files"
-      subcommand "skill-files", SkillFilesCmd
+      subcommand "skill_files", SkillFilesCmd
 
       desc "agents SUBCOMMAND", "Manage repository agents"
       subcommand "agents", Agents
 
       desc "shared-agents SUBCOMMAND", "Manage shared agents"
-      subcommand "shared-agents", SharedAgentsCmd
+      subcommand "shared_agents", SharedAgentsCmd
 
       desc "recurring SUBCOMMAND", "Manage recurring tasks"
       subcommand "recurring", Recurring
@@ -48,7 +50,7 @@ module SchwarmCli
       subcommand "sessions", Sessions
 
       desc "repo-skills SUBCOMMAND", "Manage repository-skill associations"
-      subcommand "repo-skills", RepoSkills
+      subcommand "repo_skills", RepoSkills
 
       desc "configure", "Set up Schwarm CLI configuration"
       subcommand "configure", Configure

data/lib/schwarm_cli/commands/recurring.rb

@@ -13,7 +13,7 @@ module SchwarmCli
             client.recurring.list(repository_id: resolve_repo(options[:repo]), query: options[:query], **page_params)
           end
           output_list(data, columns: [%w[ID id], %w[NAME name], %w[REPO github_repository_name],
-                                      %w[ENABLED enabled], %w[SCHEDULE schedule]])
+                                      %w[ENABLED enabled], %w[SCHEDULE cron_expression]])
         end
       end
 
@@ -23,7 +23,7 @@ module SchwarmCli
           data = client.recurring.find(id)
           output_record(data, fields: {
                           "ID" => "id", "Name" => "name", "Repository" => "github_repository_id",
-                          "Enabled" => "enabled", "Schedule" => "schedule", "Prompt" => "prompt",
+                          "Enabled" => "enabled", "Schedule" => "cron_expression", "Prompt" => "prompt",
                           "Created" => "created_at", "Updated" => "updated_at"
                         })
         end
@@ -38,11 +38,11 @@ module SchwarmCli
         handle_errors do
           attrs = {
             name: options[:name], github_repository_id: resolve_repo(options[:repo]),
-            prompt: options[:prompt], schedule: options[:schedule]
+            prompt: options[:prompt], cron_expression: options[:schedule]
           }
 
           data = client.recurring.create(**attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Schedule" => "schedule" })
+          output_record(data, fields: { "ID" => "id", "Name" => "name", "Schedule" => "cron_expression" })
         end
       end
 
@@ -53,7 +53,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" => "schedule" })
+          output_record(data, fields: { "ID" => "id", "Name" => "name", "Schedule" => "cron_expression" })
         end
       end
 
@@ -80,7 +80,7 @@ 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
     end

data/lib/schwarm_cli/commands/repos.rb

@@ -64,7 +64,11 @@ module SchwarmCli
       def pause(id)
         handle_errors do
           data = client.repositories.pause(id)
-          puts "Repository #{id} paused (#{data.dig('data', 'status')})."
+          if options[:json]
+            output_record(data, fields: {})
+          else
+            puts "Repository #{id} paused (#{data.dig('data', 'status')})."
+          end
         end
       end
 
@@ -72,7 +76,11 @@ module SchwarmCli
       def resume(id)
         handle_errors do
           data = client.repositories.resume(id)
-          puts "Repository #{id} resumed (#{data.dig('data', 'status')})."
+          if options[:json]
+            output_record(data, fields: {})
+          else
+            puts "Repository #{id} resumed (#{data.dig('data', 'status')})."
+          end
         end
       end
 

data/lib/schwarm_cli/commands/secrets.rb

@@ -11,50 +11,46 @@ module SchwarmCli
           data = fetch_paged do |page_params|
             client.secrets.list(repository_id: resolve_repo(options[:repo]), **page_params)
           end
-          output_list(data, columns: [%w[ID id], %w[NAME name], %w[REPO github_repository_name],
-                                      %w[PATH path]])
+          output_list(data, columns: [%w[ID id], %w[REPO github_repository_name], %w[PATH path]])
         end
       end
 
-      desc "show ID", "Show secret file details"
+      desc "show ID", "Show secret file details (metadata only — content is never returned)"
       def show(id)
         handle_errors do
           data = client.secrets.find(id)
           output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Repository" => "github_repository_id",
+                          "ID" => "id", "Repository" => "github_repository_name",
                           "Path" => "path", "Created" => "created_at", "Updated" => "updated_at"
                         })
         end
       end
 
       desc "create", "Create a secret file"
-      option :name, type: :string, required: true, desc: "Secret name"
       option :repo, type: :string, required: true, desc: "Repository ID, owner/repo, or GitHub URL"
       option :path, type: :string, required: true, desc: "File path in workspace"
-      option :content, type: :string, desc: "Secret content"
-      option :file, type: :string, desc: "Read content from file"
+      option :content, type: :string, desc: "Secret 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
           attrs = {
-            name: options[:name], github_repository_id: resolve_repo(options[:repo]),
-            path: options[:path], content:
+            github_repository_id: resolve_repo(options[:repo]),
+            path: options[:path], content: read_content(required: true)
           }
 
           data = client.secrets.create(**attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Path" => "path" })
+          output_record(data, fields: { "ID" => "id", "Path" => "path" })
         end
       end
 
       desc "update ID", "Update a secret file"
-      option :name, type: :string, desc: "Secret name"
       option :path, type: :string, desc: "File path in workspace"
-      option :content, type: :string, desc: "Secret content"
-      option :file, type: :string, desc: "Read content from file"
+      option :content, type: :string, desc: "Secret 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.secrets.update(id, **update_attrs)
-          output_record(data, fields: { "ID" => "id", "Name" => "name", "Path" => "path" })
+          output_record(data, fields: { "ID" => "id", "Path" => "path" })
         end
       end
 
@@ -69,19 +65,24 @@ module SchwarmCli
       private
 
       def update_attrs
-        { name: options[:name], path: options[:path] }.compact.tap do |attrs|
-          attrs[:content] = read_content if options[:content] || options[:file]
+        { path: options[:path] }.compact.tap do |attrs|
+          content = read_content(required: false)
+          attrs[:content] = content if content
         end
       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/sessions.rb

@@ -27,7 +27,8 @@ module SchwarmCli
           data = client.sessions.find(id)
           output_record(data, fields: {
                           "ID" => "id", "Source" => "source", "Status" => "status",
-                          "Prompt" => "prompt", "Result" => "result",
+                          "External ID" => "external_id", "Model" => "model_id",
+                          "Error" => "error_message",
                           "Created" => "created_at", "Updated" => "updated_at"
                         })
         end

data/lib/schwarm_cli/commands/skills.rb

@@ -21,19 +21,24 @@ module SchwarmCli
           data = client.skills.find(id)
           output_record(data, fields: {
                           "ID" => "id", "Name" => "name", "Description" => "description",
-                          "Global" => "global", "Created" => "created_at"
+                          "Instructions" => "instructions", "Global" => "global",
+                          "Created" => "created_at"
                         })
         end
       end
 
       desc "create", "Create a skill"
       option :name, type: :string, required: true, desc: "Skill name"
-      option :description, type: :string, desc: "Skill description"
+      option :description, type: :string, required: true, desc: "Skill description"
+      option :instructions, type: :string, desc: "Skill instructions (inline)"
+      option :instructions_file, type: :string, desc: "Read instructions from file"
       option :global, type: :boolean, default: false, desc: "Make skill global"
       def create
         handle_errors do
-          attrs = { name: options[:name], global: options[:global] }
-          attrs[:description] = options[:description] if options[:description]
+          attrs = {
+            name: options[:name], description: options[:description],
+            instructions: read_instructions, global: options[:global]
+          }
 
           data = client.skills.create(**attrs)
           output_record(data, fields: { "ID" => "id", "Name" => "name", "Global" => "global" })
@@ -43,6 +48,8 @@ module SchwarmCli
       desc "update ID", "Update a skill"
       option :name, type: :string, desc: "Skill name"
       option :description, type: :string, desc: "Skill description"
+      option :instructions, type: :string, desc: "Skill instructions (inline)"
+      option :instructions_file, type: :string, desc: "Read instructions from file"
       option :global, type: :boolean, desc: "Make skill global"
       def update(id)
         handle_errors do
@@ -62,10 +69,24 @@ module SchwarmCli
       private
 
       def update_attrs
+        instructions = read_instructions
         { name: options[:name], description: options[:description] }.compact.tap do |attrs|
+          attrs[:instructions] = instructions if instructions
           attrs[:global] = options[:global] unless options[:global].nil?
         end
       end
+
+      def read_instructions
+        if options[:instructions] && options[:instructions_file]
+          abort "Error: --instructions and --instructions-file are mutually exclusive."
+        elsif options[:instructions_file]
+          file_path = File.expand_path(options[:instructions_file])
+          abort "Error: File not found: #{file_path}" unless File.exist?(file_path)
+          File.read(file_path)
+        else
+          options[:instructions]
+        end
+      end
     end
   end
 end

data/lib/schwarm_cli/commands/templates.rb

@@ -20,7 +20,8 @@ module SchwarmCli
         handle_errors do
           data = client.templates.find(id)
           output_record(data, fields: {
-                          "ID" => "id", "Name" => "name", "Prompt" => "prompt", "Created" => "created_at"
+                          "ID" => "id", "Name" => "name", "Description" => "description",
+                          "Prompt" => "prompt_prefix", "Created" => "created_at"
                         })
         end
       end
@@ -28,9 +29,13 @@ module SchwarmCli
       desc "create", "Create a task template"
       option :name, type: :string, required: true, desc: "Template name"
       option :prompt, type: :string, required: true, desc: "Template prompt"
+      option :description, type: :string, desc: "Template description"
       def create
         handle_errors do
-          data = client.templates.create(name: options[:name], prompt: options[:prompt])
+          attrs = { name: options[:name], prompt_prefix: options[:prompt] }
+          attrs[:description] = options[:description] if options[:description]
+
+          data = client.templates.create(**attrs)
           output_record(data, fields: { "ID" => "id", "Name" => "name" })
         end
       end
@@ -38,13 +43,10 @@ module SchwarmCli
       desc "update ID", "Update a task template"
       option :name, type: :string, desc: "Template name"
       option :prompt, type: :string, desc: "Template prompt"
+      option :description, type: :string, desc: "Template description"
       def update(id)
         handle_errors do
-          attrs = {}
-          attrs[:name] = options[:name] if options[:name]
-          attrs[:prompt] = options[:prompt] if options[:prompt]
-
-          data = client.templates.update(id, **attrs)
+          data = client.templates.update(id, **update_attrs)
           output_record(data, fields: { "ID" => "id", "Name" => "name" })
         end
       end
@@ -56,6 +58,16 @@ module SchwarmCli
           puts "Template #{id} deleted."
         end
       end
+
+      private
+
+      def update_attrs
+        {}.tap do |attrs|
+          attrs[:name] = options[:name] if options[:name]
+          attrs[:prompt_prefix] = options[:prompt] if options[:prompt]
+          attrs[:description] = options[:description] if options[:description]
+        end
+      end
     end
   end
 end

data/lib/schwarm_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schwarm-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Vincent Garrigues