roast-ai 0.1.0 → 0.1.2

data/lib/roast/workflow/workflow_executor.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "active_support"
+require "active_support/isolated_execution_state"
+require "active_support/notifications"
+
 module Roast
   module Workflow
     # Handles the execution of workflow steps, including orchestration and threading
@@ -30,16 +34,60 @@ module Roast
       end
 
       def execute_step(name)
-        $stderr.puts "Executing: #{name}"
-        return strip_and_execute(name) if name.starts_with?("%") || name.starts_with?("$(")
+        start_time = Time.now
+        # For tests, make sure that we handle this gracefully
+        resource_type = workflow.respond_to?(:resource) ? workflow.resource&.type : nil
+
+        ActiveSupport::Notifications.instrument("roast.step.start", {
+          step_name: name,
+          resource_type: resource_type,
+        })
+
+        $stderr.puts "Executing: #{name} (Resource type: #{resource_type || "unknown"})"
+
+        result = if name.starts_with?("$(")
+          strip_and_execute(name).tap do |output|
+            # Add the command and output to the transcript for reference in following steps
+            workflow.transcript << { user: "I just executed the following command: ```\n#{name}\n```\n\nHere is the output:\n\n```\n#{output}\n```" }
+            workflow.transcript << { assistant: "Noted, thank you." }
+          end
+        elsif name.include?("*") && (!workflow.respond_to?(:resource) || !workflow.resource)
+          # Only use the glob method if we don't have a resource object yet
+          # This is for backward compatibility
+          glob(name)
+        else
+          step_object = find_and_load_step(name)
+          step_result = step_object.call
+          workflow.output[name] = step_result
+
+          # Save state after each step if the workflow supports it
+          save_state(name, step_result) if workflow.respond_to?(:session_name) && workflow.session_name
 
-        return glob(name) if name.include?("*")
+          step_result
+        end
+
+        execution_time = Time.now - start_time
 
-        step_object = find_and_load_step(name)
-        result = step_object.call
+        ActiveSupport::Notifications.instrument("roast.step.complete", {
+          step_name: name,
+          resource_type: resource_type,
+          success: true,
+          execution_time: execution_time,
+          result_size: result.to_s.length,
+        })
 
-        workflow.output[name] = result
         result
+      rescue => e
+        execution_time = Time.now - start_time
+
+        ActiveSupport::Notifications.instrument("roast.step.error", {
+          step_name: name,
+          resource_type: resource_type,
+          error: e.class.name,
+          message: e.message,
+          execution_time: execution_time,
+        })
+        raise
       end
 
       private
@@ -66,6 +114,11 @@ module Roast
       end
 
       def find_and_load_step(step_name)
+        # First check for a prompt step
+        if step_name.strip.include?(" ")
+          return Roast::Workflow::PromptStep.new(workflow, name: step_name, auto_loop: false)
+        end
+
         # First check for a ruby file with the step name
         rb_file_path = File.join(context_path, "#{step_name}.rb")
         if File.file?(rb_file_path)
@@ -100,8 +153,15 @@ module Roast
       def setup_step(step_class, step_name, context_path)
         step_class.new(workflow, name: step_name, context_path: context_path).tap do |step|
           step_config = config_hash[step_name]
+
+          # Always set the model, even if there's no step_config
+          # Use step-specific model if defined, otherwise use workflow default model, or fallback to DEFAULT_MODEL
+          step.model = step_config&.dig("model") || config_hash["model"] || DEFAULT_MODEL
+
+          # Pass resource to step if supported
+          step.resource = workflow.resource if step.respond_to?(:resource=)
+
           if step_config.present?
-            step.model = step_config["model"] || DEFAULT_MODEL
             step.print_response = step_config["print_response"] if step_config["print_response"].present?
             step.loop = step_config["loop"] if step_config["loop"].present?
             step.json = step_config["json"] if step_config["json"].present?
@@ -111,8 +171,38 @@ module Roast
       end
 
       def strip_and_execute(step)
-        command = step.gsub("%", "")
-        %x(#{command})
+        if step.match?(/^\$\((.*)\)$/)
+          command = step.strip.match(/^\$\((.*)\)$/)[1]
+          %x(#{command})
+        else
+          raise "Missing closing parentheses: #{step}"
+        end
+      end
+
+      def save_state(step_name, step_result)
+        state_repository = FileStateRepository.new
+
+        # Gather necessary data for state
+        static_data = workflow.respond_to?(:transcript) ? workflow.transcript.map(&:itself) : []
+
+        # Get output and final_output if available
+        output = workflow.respond_to?(:output) ? workflow.output.clone : {}
+        final_output = workflow.respond_to?(:final_output) ? workflow.final_output.clone : []
+
+        state_data = {
+          step_name: step_name,
+          order: output.keys.index(step_name) || output.size,
+          transcript: static_data,
+          output: output,
+          final_output: final_output,
+          execution_order: output.keys,
+        }
+
+        # Save the state
+        state_repository.save_state(workflow, step_name, state_data)
+      rescue => e
+        # Don't fail the workflow if state saving fails
+        $stderr.puts "Warning: Failed to save workflow state: #{e.message}"
       end
     end
   end

data/lib/roast/workflow.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require "roast/workflow/base_step"
+require "roast/workflow/prompt_step"
 require "roast/workflow/base_workflow"
 require "roast/workflow/configuration"
 require "roast/workflow/workflow_executor"
 require "roast/workflow/configuration_parser"
 require "roast/workflow/validator"
+require "roast/workflow/state_repository"
+require "roast/workflow/session_manager"
+require "roast/workflow/file_state_repository"
 
 module Roast
   module Workflow

data/lib/roast.rb

@@ -5,6 +5,7 @@ require "thor"
 require "roast/version"
 require "roast/tools"
 require "roast/helpers"
+require "roast/resources"
 require "roast/workflow"
 
 module Roast
@@ -16,7 +17,7 @@ module Roast
     option :output, type: :string, aliases: "-o", desc: "Save results to a file"
     option :verbose, type: :boolean, aliases: "-v", desc: "Show output from all steps as they are executed"
     option :target, type: :string, aliases: "-t", desc: "Override target files. Can be file path, glob pattern, or $(shell command)"
-    option :subject, type: :string, aliases: "-s", desc: "Subject file to analyze"
+    option :replay, type: :string, aliases: "-r", desc: "Resume workflow from a specific step. Format: step_name or session_timestamp:step_name"
     def execute(*paths)
       raise Thor::Error, "Workflow configuration file is required" if paths.empty?
 
@@ -24,10 +25,6 @@ module Roast
       expanded_workflow_path = File.expand_path(workflow_path)
       raise Thor::Error, "Expected a Roast workflow configuration file, got directory: #{expanded_workflow_path}" if File.directory?(expanded_workflow_path)
 
-      if options[:subject] && !File.exist?(options[:subject])
-        raise Thor::Error, "Subject file does not exist: #{options[:subject]}"
-      end
-
       Roast::Workflow::ConfigurationParser.new(expanded_workflow_path, files, options.transform_keys(&:to_sym)).begin!
     end
 

data/roast.gemspec

@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency("activesupport", "~> 8.0")
   spec.add_dependency("faraday-retry")
   spec.add_dependency("json-schema")
-  spec.add_dependency("raix", "0.8.3")
+  spec.add_dependency("raix", "~> 0.8.4")
   spec.add_dependency("thor", "~> 1.3")
 end

data/schema/workflow.json

@@ -11,6 +11,18 @@
           "type": "string"
         }
       },
+      "target": {
+        "type": "string",
+        "description": "Optional target file, glob pattern, or shell command for the workflow to operate on"
+      },
+      "api_token": {
+        "type": "string",
+        "description": "Shell command to fetch an API token dynamically, e.g. $(cat ~/.my-token)"
+      },
+      "model": {
+        "type": "string",
+        "description": "Default AI model to use for all steps in the workflow"
+      },
       "inputs": {
         "type": "array",
         "items": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roast-ai
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Shopify
@@ -55,16 +55,16 @@ dependencies:
   name: raix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,6 @@ files:
 - ".github/workflows/ci.yaml"
 - ".github/workflows/cla.yml"
 - ".gitignore"
-- ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
@@ -105,12 +104,22 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- docs/INSTRUMENTATION.md
+- examples/api_workflow/README.md
+- examples/api_workflow/fetch_api_data/prompt.md
+- examples/api_workflow/generate_report/prompt.md
+- examples/api_workflow/prompt.md
+- examples/api_workflow/transform_data/prompt.md
+- examples/api_workflow/workflow.yml
 - examples/grading/analyze_coverage/prompt.md
 - examples/grading/calculate_final_grade.rb
 - examples/grading/format_result.rb
 - examples/grading/generate_grades/prompt.md
 - examples/grading/generate_recommendations/output.txt
 - examples/grading/generate_recommendations/prompt.md
+- examples/grading/js_test_runner
+- examples/grading/rb_test_runner
+- examples/grading/read_dependencies/prompt.md
 - examples/grading/run_coverage.rb
 - examples/grading/verify_mocks_and_stubs/prompt.md
 - examples/grading/verify_test_helpers/prompt.md
@@ -118,6 +127,13 @@ files:
 - examples/grading/workflow.rb.md
 - examples/grading/workflow.ts+tsx.md
 - examples/grading/workflow.yml
+- examples/instrumentation.rb
+- examples/rspec_to_minitest/README.md
+- examples/rspec_to_minitest/analyze_spec/prompt.md
+- examples/rspec_to_minitest/create_minitest/prompt.md
+- examples/rspec_to_minitest/run_and_improve/prompt.md
+- examples/rspec_to_minitest/workflow.md
+- examples/rspec_to_minitest/workflow.yml
 - exe/roast
 - lib/roast.rb
 - lib/roast/helpers.rb
@@ -126,8 +142,16 @@ files:
 - lib/roast/helpers/minitest_coverage_runner.rb
 - lib/roast/helpers/path_resolver.rb
 - lib/roast/helpers/prompt_loader.rb
+- lib/roast/resources.rb
+- lib/roast/resources/api_resource.rb
+- lib/roast/resources/base_resource.rb
+- lib/roast/resources/directory_resource.rb
+- lib/roast/resources/file_resource.rb
+- lib/roast/resources/none_resource.rb
+- lib/roast/resources/url_resource.rb
 - lib/roast/tools.rb
 - lib/roast/tools/cmd.rb
+- lib/roast/tools/coding_agent.rb
 - lib/roast/tools/grep.rb
 - lib/roast/tools/read_file.rb
 - lib/roast/tools/search_file.rb
@@ -138,6 +162,10 @@ files:
 - lib/roast/workflow/base_workflow.rb
 - lib/roast/workflow/configuration.rb
 - lib/roast/workflow/configuration_parser.rb
+- lib/roast/workflow/file_state_repository.rb
+- lib/roast/workflow/prompt_step.rb
+- lib/roast/workflow/session_manager.rb
+- lib/roast/workflow/state_repository.rb
 - lib/roast/workflow/validator.rb
 - lib/roast/workflow/workflow_executor.rb
 - roast.gemspec

data/.rspec

@@ -1 +0,0 @@
---require spec_helper