roast-ai 0.4.2 → 0.4.3

data/lib/roast/workflow/step_loader.rb

@@ -60,10 +60,15 @@ module Roast
           return step
         end
 
-        # Look for Ruby file in various locations
-        step_file_path = find_step_file(name.to_s, per_step_path)
-        if step_file_path
-          return load_ruby_step(step_file_path, name.to_s, is_last_step:)
+        # Look for Ruby or shell script file in various locations
+        step_file_info = find_step_file(name.to_s, per_step_path)
+        if step_file_info
+          case step_file_info[:type]
+          when :ruby
+            return load_ruby_step(step_file_info[:path], name.to_s, is_last_step:)
+          when :shell
+            return load_shell_script_step(step_file_info[:path], name.to_s, step_key, is_last_step:)
+          end
         end
 
         # Look for step directory
@@ -87,28 +92,40 @@ module Roast
         File.expand_path(path, context_path)
       end
 
-      # Find a Ruby step file in various locations
+      # Find a Ruby or shell script step file in various locations
       def find_step_file(step_name, per_step_path = nil)
         # Check in per-step path first
         if per_step_path
           resolved_per_step_path = resolve_path(per_step_path)
           custom_rb_path = File.join(resolved_per_step_path, "#{step_name}.rb")
-          return custom_rb_path if File.file?(custom_rb_path)
+          return { path: custom_rb_path, type: :ruby } if File.file?(custom_rb_path)
+
+          custom_sh_path = File.join(resolved_per_step_path, "#{step_name}.sh")
+          return { path: custom_sh_path, type: :shell } if File.file?(custom_sh_path)
         end
 
         # Check in phase-specific directory first
         if phase != :steps
           phase_rb_path = File.join(context_path, phase.to_s, "#{step_name}.rb")
-          return phase_rb_path if File.file?(phase_rb_path)
+          return { path: phase_rb_path, type: :ruby } if File.file?(phase_rb_path)
+
+          phase_sh_path = File.join(context_path, phase.to_s, "#{step_name}.sh")
+          return { path: phase_sh_path, type: :shell } if File.file?(phase_sh_path)
         end
 
         # Check in context path
         rb_file_path = File.join(context_path, "#{step_name}.rb")
-        return rb_file_path if File.file?(rb_file_path)
+        return { path: rb_file_path, type: :ruby } if File.file?(rb_file_path)
+
+        sh_file_path = File.join(context_path, "#{step_name}.sh")
+        return { path: sh_file_path, type: :shell } if File.file?(sh_file_path)
 
         # Check in shared directory
         shared_rb_path = File.expand_path(File.join(context_path, "..", "shared", "#{step_name}.rb"))
-        return shared_rb_path if File.file?(shared_rb_path)
+        return { path: shared_rb_path, type: :ruby } if File.file?(shared_rb_path)
+
+        shared_sh_path = File.expand_path(File.join(context_path, "..", "shared", "#{step_name}.sh"))
+        return { path: shared_sh_path, type: :shell } if File.file?(shared_sh_path)
 
         nil
       end
@@ -161,6 +178,23 @@ module Roast
         step
       end
 
+      # Load a shell script step from a file
+      def load_shell_script_step(file_path, step_name, step_key, is_last_step: nil)
+        $stderr.puts "Loading shell script step: #{file_path}"
+
+        step_name_obj = Roast::ValueObjects::StepName.new(step_name)
+
+        step = ShellScriptStep.new(
+          workflow,
+          script_path: file_path,
+          name: step_name_obj,
+          context_path: File.dirname(file_path),
+        )
+
+        configure_step(step, step_key || step_name, is_last_step:)
+        step
+      end
+
       # Create and configure a step instance
       def create_step_instance(step_class, step_name, context_path, options = {})
         is_last_step = options[:is_last_step]
@@ -203,6 +237,18 @@ module Roast
         if step_config.key?("available_tools")
           step.available_tools = step_config["available_tools"]
         end
+
+        # Apply any other configuration attributes that the step supports
+        step_config.each do |key, value|
+          # Skip keys we've already handled above
+          next if ["print_response", "json", "params", "coerce_to", "available_tools"].include?(key)
+
+          # Apply configuration if the step has a setter for this attribute
+          setter_method = "#{key}="
+          if step.respond_to?(setter_method)
+            step.public_send(setter_method, value)
+          end
+        end
       end
     end
   end

data/lib/roast/workflow/workflow_executor.rb

@@ -42,7 +42,6 @@ module Roast
       # @param state_manager [StateManager] Optional custom state manager
       # @param iteration_executor [IterationExecutor] Optional custom iteration executor
       # @param conditional_executor [ConditionalExecutor] Optional custom conditional executor
-      # @param step_orchestrator [StepOrchestrator] Optional custom step orchestrator
       # @param step_executor_coordinator [StepExecutorCoordinator] Optional custom step executor coordinator
       # @param phase [Symbol] The execution phase - determines where to load steps from
       #   Valid values:
@@ -52,7 +51,7 @@ module Roast
       def initialize(workflow, config_hash, context_path,
         error_handler: nil, step_loader: nil, command_executor: nil,
         interpolator: nil, state_manager: nil, iteration_executor: nil,
-        conditional_executor: nil, step_orchestrator: nil, step_executor_coordinator: nil,
+        conditional_executor: nil, step_executor_coordinator: nil,
         phase: :steps)
         # Create context object to reduce data clump
         @context = WorkflowContext.new(
@@ -69,7 +68,6 @@ module Roast
         @state_manager = state_manager || StateManager.new(workflow, logger: @error_handler, storage_type: workflow.storage_type)
         @iteration_executor = iteration_executor || IterationExecutor.new(workflow, context_path, @state_manager, config_hash)
         @conditional_executor = conditional_executor || ConditionalExecutor.new(workflow, context_path, @state_manager, self)
-        @step_orchestrator = step_orchestrator || StepOrchestrator.new(workflow, @step_loader, @state_manager, @error_handler, self)
 
         # Initialize coordinator with dependencies
         base_coordinator = step_executor_coordinator || StepExecutorCoordinator.new(
@@ -80,7 +78,8 @@ module Roast
             command_executor: @command_executor,
             iteration_executor: @iteration_executor,
             conditional_executor: @conditional_executor,
-            step_orchestrator: @step_orchestrator,
+            step_loader: @step_loader,
+            state_manager: @state_manager,
             error_handler: @error_handler,
           },
         )

data/lib/roast/workflow/workflow_initializer.rb

@@ -75,20 +75,28 @@ module Roast
             puts ::CLI::UI.fmt("{{cyan:    uri_base: \"https://openrouter.ai/api/v1\",}}")
             puts ::CLI::UI.fmt("{{cyan:  )}}")
           else
-            puts ::CLI::UI.fmt("{{cyan:require \"faraday\"}}")
-            puts ::CLI::UI.fmt("{{cyan:require \"faraday/retry\"}}")
             puts
-            puts ::CLI::UI.fmt("{{cyan: Raix.configure do |config|}}")
+            puts ::CLI::UI.fmt("{{cyan:faraday_retry = false}}")
+            puts ::CLI::UI.fmt("{{cyan:begin}}")
+            puts ::CLI::UI.fmt("{{cyan:  require \"faraday/retry\"}}")
+            puts ::CLI::UI.fmt("{{cyan:  faraday_retry = true}}")
+            puts ::CLI::UI.fmt("{{cyan:rescue LoadError}}")
+            puts ::CLI::UI.fmt("{{cyan:  # Do nothing}}")
+            puts ::CLI::UI.fmt("{{cyan:end}}")
+            puts
+            puts ::CLI::UI.fmt("{{cyan:Raix.configure do |config|}}")
             puts ::CLI::UI.fmt("{{cyan:  config.openai_client = OpenAI::Client.new(}}")
             puts ::CLI::UI.fmt("{{cyan:    access_token: ENV.fetch(\"OPENAI_API_KEY\"),}}")
             puts ::CLI::UI.fmt("{{cyan:    uri_base: \"https://api.openai.com/v1\",}}")
             puts ::CLI::UI.fmt("{{cyan:  ) do |f|}}")
-            puts ::CLI::UI.fmt("{{cyan:    f.request(:retry, {}}")
-            puts ::CLI::UI.fmt("{{cyan:      max: 2,}}")
-            puts ::CLI::UI.fmt("{{cyan:      interval: 0.05,}}")
-            puts ::CLI::UI.fmt("{{cyan:      interval_randomness: 0.5,}}")
-            puts ::CLI::UI.fmt("{{cyan:      backoff_factor: 2,}}")
-            puts ::CLI::UI.fmt("{{cyan:    })}}")
+            puts ::CLI::UI.fmt("{{cyan:    if faraday_retry}}")
+            puts ::CLI::UI.fmt("{{cyan:      f.request(:retry, {}}")
+            puts ::CLI::UI.fmt("{{cyan:        max: 2,}}")
+            puts ::CLI::UI.fmt("{{cyan:        interval: 0.05,}}")
+            puts ::CLI::UI.fmt("{{cyan:        interval_randomness: 0.5,}}")
+            puts ::CLI::UI.fmt("{{cyan:        backoff_factor: 2,}}")
+            puts ::CLI::UI.fmt("{{cyan:      })}}")
+            puts ::CLI::UI.fmt("{{cyan:    end}}")
             puts ::CLI::UI.fmt("{{cyan:  end}}")
           end
           puts ::CLI::UI.fmt("{{cyan:end}}")
@@ -103,15 +111,18 @@ module Roast
       def include_tools
         return unless @configuration.tools.present? || @configuration.mcp_tools.present?
 
-        BaseWorkflow.include(Raix::FunctionDispatch)
-        BaseWorkflow.include(Roast::Helpers::FunctionCachingInterceptor) # Add caching support
+        # Only include modules if they haven't been included already to avoid method redefinition warnings
+        BaseWorkflow.include(Raix::FunctionDispatch) unless BaseWorkflow.included_modules.include?(Raix::FunctionDispatch)
+        BaseWorkflow.include(Roast::Helpers::FunctionCachingInterceptor) unless BaseWorkflow.included_modules.include?(Roast::Helpers::FunctionCachingInterceptor)
 
         if @configuration.tools.present?
-          BaseWorkflow.include(*@configuration.tools.map(&:constantize))
+          @configuration.tools.map(&:constantize).each do |tool|
+            BaseWorkflow.include(tool) unless BaseWorkflow.included_modules.include?(tool)
+          end
         end
 
         if @configuration.mcp_tools.present?
-          BaseWorkflow.include(Raix::MCP)
+          BaseWorkflow.include(Raix::MCP) unless BaseWorkflow.included_modules.include?(Raix::MCP)
 
           # Create an interpolator for MCP tool configuration
           # We use Object.new as the context because this interpolation happens during

data/lib/roast/workflow/workflow_runner.rb

@@ -91,11 +91,11 @@ module Roast
         executor = WorkflowExecutor.new(workflow, @configuration.config_hash, @configuration.context_path)
         executor.execute_steps(steps)
 
-        $stderr.puts "🔥🔥🔥 ROAST COMPLETE! 🔥🔥🔥"
-
         # Save outputs
         @output_handler.save_final_output(workflow)
         @output_handler.write_results(workflow)
+
+        $stderr.puts "🔥🔥🔥 ROAST COMPLETE! 🔥🔥🔥"
       end
 
       private

data/lib/roast.rb

@@ -11,6 +11,7 @@ require "net/http"
 require "open3"
 require "pathname"
 require "securerandom"
+require "shellwords"
 require "tempfile"
 require "uri"
 require "yaml"

data/roast.gemspec

@@ -40,10 +40,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency("cli-kit", "~> 5.0")
   spec.add_dependency("cli-ui", "2.3.0")
   spec.add_dependency("diff-lcs", "~> 1.5")
-  spec.add_dependency("faraday-retry")
   spec.add_dependency("json-schema")
   spec.add_dependency("open_router", "~> 0.3")
-  spec.add_dependency("raix", "~> 1.0")
+  spec.add_dependency("raix-openai-eight", "~> 1.0")
   spec.add_dependency("ruby-graphviz", "~> 1.2")
   spec.add_dependency("sqlite3", "~> 2.6")
   spec.add_dependency("thor", "~> 1.3")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roast-ai
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Shopify
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: faraday-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: raix
+  name: raix-openai-eight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -273,6 +259,8 @@ files:
 - examples/cmd/explorer_workflow.png
 - examples/cmd/explorer_workflow.yml
 - examples/cmd/smart_tool_selection/prompt.md
+- examples/coding_agent_with_model.yml
+- examples/coding_agent_with_retries.yml
 - examples/conditional/README.md
 - examples/conditional/check_condition/prompt.md
 - examples/conditional/simple_workflow.png
@@ -456,6 +444,7 @@ files:
 - lib/roast/factories/api_provider_factory.rb
 - lib/roast/helpers/function_caching_interceptor.rb
 - lib/roast/helpers/logger.rb
+- lib/roast/helpers/metadata_access.rb
 - lib/roast/helpers/minitest_coverage_runner.rb
 - lib/roast/helpers/path_resolver.rb
 - lib/roast/helpers/prompt_loader.rb
@@ -517,6 +506,7 @@ files:
 - lib/roast/workflow/interpolator.rb
 - lib/roast/workflow/iteration_executor.rb
 - lib/roast/workflow/llm_boolean_coercer.rb
+- lib/roast/workflow/metadata_manager.rb
 - lib/roast/workflow/output_handler.rb
 - lib/roast/workflow/output_manager.rb
 - lib/roast/workflow/parallel_executor.rb
@@ -525,6 +515,7 @@ files:
 - lib/roast/workflow/replay_handler.rb
 - lib/roast/workflow/resource_resolver.rb
 - lib/roast/workflow/session_manager.rb
+- lib/roast/workflow/shell_script_step.rb
 - lib/roast/workflow/sqlite_state_repository.rb
 - lib/roast/workflow/state_manager.rb
 - lib/roast/workflow/state_repository.rb
@@ -542,7 +533,6 @@ files:
 - lib/roast/workflow/step_finder.rb
 - lib/roast/workflow/step_loader.rb
 - lib/roast/workflow/step_name_extractor.rb
-- lib/roast/workflow/step_orchestrator.rb
 - lib/roast/workflow/step_runner.rb
 - lib/roast/workflow/step_type_resolver.rb
 - lib/roast/workflow/validation_command.rb
@@ -585,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: A framework for executing structured AI workflows in Ruby
 test_files: []

data/lib/roast/workflow/step_orchestrator.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Roast
-  module Workflow
-    # Handles the orchestration of step execution, managing the flow and control
-    # of individual steps without knowing how to execute them
-    #
-    # This class is specifically for executing CUSTOM steps defined in the workflow's
-    # step directory (e.g., steps/*.rb files). It loads and executes Ruby step files
-    # that define a `call` method.
-    #
-    # The primary method execute_step is used by StepExecutorCoordinator for
-    # executing custom Ruby steps.
-    #
-    # TODO: Consider renaming this class to CustomStepOrchestrator to clarify its purpose
-    class StepOrchestrator
-      def initialize(workflow, step_loader, state_manager, error_handler, workflow_executor)
-        @workflow = workflow
-        @step_loader = step_loader
-        @state_manager = state_manager
-        @error_handler = error_handler
-        @workflow_executor = workflow_executor
-      end
-
-      def execute_step(name, exit_on_error: true, step_key: nil, **options)
-        resource_type = @workflow.respond_to?(:resource) ? @workflow.resource&.type : nil
-
-        @error_handler.with_error_handling(name, resource_type: resource_type) do
-          $stderr.puts "Executing: #{name} (Resource type: #{resource_type || "unknown"})"
-
-          # Use step_key for loading if provided, otherwise use name
-          load_key = step_key || name
-          is_last_step = options[:is_last_step]
-          step_object = @step_loader.load(name, step_key: load_key, is_last_step:, **options)
-          step_result = step_object.call
-
-          # Store result in workflow output
-          @workflow.output[name] = step_result
-
-          # Save state after each step
-          @state_manager.save_state(name, step_result)
-
-          step_result
-        end
-      end
-    end
-  end
-end