roast-ai 0.4.4 → 0.4.6

data/lib/roast/workflow/step_executor_coordinator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast
@@ -59,6 +60,10 @@ module Roast
         Thread.current[:current_step_name] = step_name if step_name
         Thread.current[:workflow_metadata] = @context.workflow.metadata
 
+        unless options[:retries]
+          options[:retries] = @context.config_hash[step_name]&.fetch("retries", 0) || 0
+        end
+
         case step_type
         when StepTypeResolver::COMMAND_STEP
           # Command steps should also go through interpolation
@@ -145,9 +150,12 @@ module Roast
       def execute_command_step(step, options)
         exit_on_error = options.fetch(:exit_on_error, true)
         resource_type = @context.resource_type
+        step_key = options[:step_key]
+        display_name = step_key || step
+        retries = options.fetch(:retries, 0)
 
-        error_handler.with_error_handling(step, resource_type: resource_type) do
-          $stderr.puts "Executing: #{step} (Resource type: #{resource_type || "unknown"})"
+        error_handler.with_error_handling(display_name, resource_type: resource_type, retries:) do
+          $stderr.puts "Executing: #{display_name} (Resource type: #{resource_type || "unknown"})"
 
           begin
             output = command_executor.execute(step, exit_on_error: exit_on_error)
@@ -169,7 +177,7 @@ module Roast
             output
           rescue CommandExecutor::CommandExecutionError => e
             # Print user-friendly error message
-            $stderr.puts "\n❌ Command failed: #{step}"
+            $stderr.puts "\n❌ Command failed: #{display_name}"
             $stderr.puts "   Exit status: #{e.exit_status}" if e.exit_status
 
             # Show command output if available
@@ -257,9 +265,11 @@ module Roast
         interpolated_step = interpolator.interpolate(step)
 
         if StepTypeResolver.command_step?(interpolated_step)
-          # Command step - execute directly, preserving any passed options
+          # Command step - execute directly, preserving any passed options including step_key
           exit_on_error = options.fetch(:exit_on_error, true)
-          execute_command_step(interpolated_step, { exit_on_error: })
+          step_key = options[:step_key]
+          retries = options[:retries] || 0
+          execute_command_step(interpolated_step, { exit_on_error:, step_key:, retries: })
         else
           exit_on_error = options.fetch(:exit_on_error, context.exit_on_error?(step))
           execute_standard_step(interpolated_step, options.merge(exit_on_error:))
@@ -282,8 +292,9 @@ module Roast
 
       def execute_custom_step(name, step_key: nil, **options)
         resource_type = @context.workflow.respond_to?(:resource) ? @context.workflow.resource&.type : nil
+        retries = options[:retries] || 0
 
-        error_handler.with_error_handling(name, resource_type: resource_type) do
+        error_handler.with_error_handling(name, resource_type: resource_type, retries:) do
           $stderr.puts "Executing: #{name} (Resource type: #{resource_type || "unknown"})"
 
           # Use step_key for loading if provided, otherwise use name

data/lib/roast/workflow/step_executor_factory.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_executor_registry.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast
@@ -54,9 +55,7 @@ module Roast
         private
 
         def find_executor_class(step)
-          # First check exact class matches
-          executor_class = @executors[step.class]
-          return executor_class if executor_class
+          return @executors[step.class] if @executors[step.class]
 
           # Then check custom matchers
           matcher_entry = @type_matchers.find { |entry| entry[:matcher].call(step) }

data/lib/roast/workflow/step_executor_with_reporting.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_executors/base_step_executor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_executors/hash_step_executor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_executors/parallel_step_executor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_executors/string_step_executor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_factory.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_loader.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_name_extractor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_runner.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/step_type_resolver.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validation_command.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/base_validator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/dependency_validator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/linting_validator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/schema_validator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/step_collector.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/validators/validation_orchestrator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/workflow_context.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/workflow_execution_context.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow/workflow_executor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast
@@ -61,7 +62,7 @@ module Roast
         )
 
         # Dependencies with defaults
-        @error_handler = error_handler || ErrorHandler.new
+        @error_handler = error_handler || ErrorHandler.new(workflow)
         @step_loader = step_loader || StepLoader.new(workflow, config_hash, context_path, phase: phase)
         @command_executor = command_executor || CommandExecutor.new(logger: @error_handler)
         @interpolator = interpolator || Interpolator.new(workflow, logger: @error_handler)

data/lib/roast/workflow/workflow_initializer.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Roast
@@ -28,6 +29,9 @@ module Roast
         # Only check if the workflow has steps that would need API access
         return if @configuration.steps.empty?
 
+        # Strip whitespace from existing Raix clients
+        strip_tokens_from_existing_clients
+
         # Check if Raix has been configured with the appropriate client
         case @configuration.api_provider
         when :openai
@@ -214,7 +218,7 @@ module Roast
 
       def client_options
         {
-          access_token: @configuration.api_token,
+          access_token: @configuration.api_token&.strip,
           uri_base: @configuration.uri_base&.to_s,
         }.compact
       end
@@ -264,6 +268,17 @@ module Roast
         end
         interpolated
       end
+
+      def strip_tokens_from_existing_clients
+        strip_token_in_client(Raix.configuration.openai_client)
+        strip_token_in_client(Raix.configuration.openrouter_client)
+      end
+
+      def strip_token_in_client(client)
+        return unless client.respond_to?(:access_token)
+
+        client.instance_variable_set(:@access_token, client.access_token&.strip)
+      end
     end
   end
 end

data/lib/roast/workflow/workflow_runner.rb

@@ -1,83 +1,67 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast
   module Workflow
-    # Handles running workflows for files/targets and orchestrating execution
     class WorkflowRunner
-      def initialize(configuration, options = {})
-        @configuration = configuration
+      attr_reader :configuration, :options, :files
+
+      def initialize(workflow_path, files = [], options = {})
+        @configuration = Configuration.new(workflow_path, options)
         @options = options
+        @files = files || []
         @output_handler = OutputHandler.new
         @execution_context = WorkflowExecutionContext.new
-      end
-
-      def run_for_files(files)
-        if @configuration.has_target?
-          $stderr.puts "WARNING: Ignoring target parameter because files were provided: #{@configuration.target}"
-        end
 
-        # Execute pre-processing steps once before any targets
-        if @configuration.pre_processing.any?
-          $stderr.puts "Running pre-processing steps..."
-          run_pre_processing
-        end
-
-        # Execute main workflow for each file
-        files.each do |file|
-          $stderr.puts "Running workflow for file: #{file}"
-          run_single_workflow(file.strip)
-        end
-
-        # Execute post-processing steps once after all targets
-        if @configuration.post_processing.any?
-          $stderr.puts "Running post-processing steps..."
-          run_post_processing
-        end
+        initializer = WorkflowInitializer.new(@configuration)
+        initializer.setup
       end
 
-      def run_for_targets
-        # Split targets by line and clean up
-        target_lines = @configuration.target.lines.map(&:strip).reject(&:empty?)
+      def begin!
+        start_time = Time.now
+        $stderr.puts "Starting workflow..."
+        $stderr.puts "Workflow: #{configuration.workflow_path}"
+        $stderr.puts "Options: #{options}"
+
+        ActiveSupport::Notifications.instrument("roast.workflow.start", {
+          workflow_path: configuration.workflow_path,
+          options: options,
+          name: configuration.basename,
+        })
 
         # Execute pre-processing steps once before any targets
-        if @configuration.pre_processing.any?
+        if @configuration.pre_processing?
           $stderr.puts "Running pre-processing steps..."
           run_pre_processing
         end
 
-        # Execute main workflow for each target
-        target_lines.each do |file|
-          $stderr.puts "Running workflow for file: #{file}"
-          run_single_workflow(file)
+        if files.any?
+          run_for_files(files)
+        elsif configuration.has_target?
+          run_for_targets
+        else
+          run_targetless
         end
 
         # Execute post-processing steps once after all targets
-        if @configuration.post_processing.any?
+        if @configuration.post_processing?
           $stderr.puts "Running post-processing steps..."
           run_post_processing
         end
+      rescue Roast::Errors::ExitEarly
+        $stderr.puts "Exiting workflow early."
+      ensure
+        execution_time = Time.now - start_time
+
+        ActiveSupport::Notifications.instrument("roast.workflow.complete", {
+          workflow_path: configuration.workflow_path,
+          success: !$ERROR_INFO,
+          execution_time: execution_time,
+        })
       end
 
-      def run_targetless
-        $stderr.puts "Running targetless workflow"
-
-        # Execute pre-processing steps
-        if @configuration.pre_processing.any?
-          $stderr.puts "Running pre-processing steps..."
-          run_pre_processing
-        end
-
-        # Execute main workflow
-        run_single_workflow(nil)
-
-        # Execute post-processing steps
-        if @configuration.post_processing.any?
-          $stderr.puts "Running post-processing steps..."
-          run_post_processing
-        end
-      end
+      private
 
-      # Public for backward compatibility with tests
       def execute_workflow(workflow)
         steps = @configuration.steps
 
@@ -98,7 +82,34 @@ module Roast
         $stderr.puts "🔥🔥🔥 ROAST COMPLETE! 🔥🔥🔥"
       end
 
-      private
+      def run_for_files(files)
+        if @configuration.has_target?
+          $stderr.puts "WARNING: Ignoring target parameter because files were provided: #{@configuration.target}"
+        end
+
+        # Execute main workflow for each file
+        files.each do |file|
+          $stderr.puts "Running workflow for file: #{file}"
+          run_single_workflow(file.strip)
+        end
+      end
+
+      def run_for_targets
+        # Split targets by line and clean up
+        target_lines = @configuration.target.lines.map(&:strip).reject(&:empty?)
+
+        # Execute main workflow for each target
+        target_lines.each do |file|
+          $stderr.puts "Running workflow for file: #{file}"
+          run_single_workflow(file)
+        end
+      end
+
+      def run_targetless
+        $stderr.puts "Running targetless workflow"
+        # Execute main workflow
+        run_single_workflow(nil)
+      end
 
       def run_single_workflow(file)
         # Pass pre-processing data to target workflows

data/lib/roast/workflow.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast

data/lib/roast/workflow_diagram_generator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Roast
@@ -74,7 +75,7 @@ module Roast
       when Hash
         process_control_flow(step)
       else
-        ::CLI::Kit.logger.warn("Unexpected step type in workflow diagram: #{step.class} - #{step.inspect}")
+        Roast::Helpers::Logger.warn("Unexpected step type in workflow diagram: #{step.class} - #{step.inspect}")
         nil
       end
     end
@@ -112,7 +113,7 @@ module Roast
       elsif control_flow.key?("case")
         process_case(control_flow)
       else
-        ::CLI::Kit.logger.warn("Unexpected control flow structure in workflow diagram: #{control_flow.keys.join(", ")}")
+        Roast::Helpers::Logger.warn("Unexpected control flow structure in workflow diagram: #{control_flow.keys.join(", ")}")
         nil
       end
     end

data/lib/roast.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 # Standard library requires
@@ -13,6 +14,7 @@ require "pathname"
 require "securerandom"
 require "shellwords"
 require "tempfile"
+require "timeout"
 require "uri"
 require "yaml"
 
@@ -40,6 +42,7 @@ require "zeitwerk"
 
 # Set up Zeitwerk autoloader
 loader = Zeitwerk::Loader.for_gem
+loader.inflector.inflect("dsl" => "DSL")
 loader.setup
 
 module Roast
@@ -54,21 +57,33 @@ module Roast
     option :replay, type: :string, aliases: "-r", desc: "Resume workflow from a specific step. Format: step_name or session_timestamp:step_name"
     option :pause, type: :string, aliases: "-p", desc: "Pause workflow after a specific step. Format: step_name"
     option :file_storage, type: :boolean, aliases: "-f", desc: "Use filesystem storage for sessions instead of SQLite"
+    option :executor, type: :string, default: "default", desc: "Set workflow executor - experimental syntax"
 
     def execute(*paths)
       raise Thor::Error, "Workflow configuration file is required" if paths.empty?
 
       workflow_path, *files = paths
 
-      expanded_workflow_path = if workflow_path.include?("workflow.yml")
-        File.expand_path(workflow_path)
+      if options[:executor] == "dsl"
+        puts "⚠️ WARNING: This is an experimental syntax and may break at any time. Don't depend on it."
+        Roast::DSL::Executor.from_file(workflow_path)
       else
-        File.expand_path("roast/#{workflow_path}/workflow.yml")
-      end
+        expanded_workflow_path = if workflow_path.include?("workflow.yml")
+          File.expand_path(workflow_path)
+        else
+          File.expand_path("roast/#{workflow_path}/workflow.yml")
+        end
 
-      raise Thor::Error, "Expected a Roast workflow configuration file, got directory: #{expanded_workflow_path}" if File.directory?(expanded_workflow_path)
+        raise Thor::Error, "Expected a Roast workflow configuration file, got directory: #{expanded_workflow_path}" if File.directory?(expanded_workflow_path)
 
-      Roast::Workflow::ConfigurationParser.new(expanded_workflow_path, files, options.transform_keys(&:to_sym)).begin!
+        Roast::Workflow::WorkflowRunner.new(expanded_workflow_path, files, options.transform_keys(&:to_sym)).begin!
+      end
+    rescue => e
+      if options[:verbose]
+        raise e
+      else
+        $stderr.puts e.message
+      end
     end
 
     desc "resume WORKFLOW_FILE", "Resume a paused workflow with an event"
@@ -106,7 +121,7 @@ module Roast
         session_id: session_id,
       )
 
-      Roast::Workflow::ConfigurationParser.new(expanded_workflow_path, [], resume_options).begin!
+      Roast::Workflow::WorkflowRunner.new(expanded_workflow_path, [], resume_options).begin!
     end
 
     desc "version", "Display the current version of Roast"
@@ -336,7 +351,7 @@ module Roast
 
       begin
         # Execute the workflow generator (it will handle user input)
-        Roast::Workflow::ConfigurationParser.new(generator_path, [], {}).begin!
+        Roast::Workflow::WorkflowRunner.new(generator_path, [], {}).begin!
 
         puts
         puts("Workflow generation complete!")

data/sorbet/config

@@ -0,0 +1,8 @@
+--dir
+.
+--ignore=tmp/
+--ignore=vendor/
+--ignore=test/
+--ignore=bin/
+--enable-experimental-requires-ancestor
+--enable-experimental-rbs-comments

data/sorbet/rbi/dsl/.gitattributes

@@ -0,0 +1 @@
+**/*.rbi linguist-generated=true

data/sorbet/rbi/dsl/active_support/callbacks.rbi

@@ -0,0 +1,21 @@
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for dynamic methods in `ActiveSupport::Callbacks`.
+# Please instead update this file by running `bin/tapioca dsl ActiveSupport::Callbacks`.
+
+
+module ActiveSupport::Callbacks
+  include GeneratedInstanceMethods
+
+  mixes_in_class_methods GeneratedClassMethods
+
+  module GeneratedClassMethods
+    def __callbacks; end
+    def __callbacks=(value); end
+  end
+
+  module GeneratedInstanceMethods
+    def __callbacks; end
+  end
+end

data/sorbet/rbi/gems/.gitattributes

@@ -0,0 +1 @@
+**/*.rbi linguist-generated=true