roast-ai 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19ea3373017e147359ddf4c1f6ccf340bd7d7ac50a870be68f78f15cf80b5d8
-  data.tar.gz: c6fb3bc056f2112ced9719aef312bb8ed2d2ccbd2eac6e44996ab329b36722b8
+  metadata.gz: 45106bfcf14cd8dac143f9b31331d5c272cba04152390097debb22a466edd4cd
+  data.tar.gz: 8097250f8cc80405c0002928a946a0635c430e6d631de51f62487e356ec19891
 SHA512:
-  metadata.gz: b8cf9c2e98c8475f64a4b81cb002ccd254fd483cf97fd718eb9a07952b2423965c7813ea212110819456793c37d412bbdd808ef35d3f176085768bde9ddce9e7
-  data.tar.gz: 0bf31300a5a3463211435ede98a8826a3dfcf8207198184aada65ce1f0e64efeb8ac78a1b4b3fa41dbfb03b7337f63076186c5bd02ff849ee789796e3b4060de
+  metadata.gz: 9b6a836153aeeda05efd1c30b0be46453709bb9a4bb3480aed00b136da3ecd566f4b6d8a2ad6f88e5a19ee5774dfe42621a0239b7b0a5b3c0d192f29e25efc08
+  data.tar.gz: d4591075f64cc6e4ca0e14d0ea8555026f4bd3211fb6ebfd80c03c4a92897abbd47a0269e9f40e356a3b8e420165aa231d4e8196b7827c4cac6d3955c645b24c

data/Gemfile

@@ -14,6 +14,7 @@ gem "cli-ui", github: "Shopify/cli-ui", branch: "main"
 group :development, :test do
   gem "guard-minitest"
   gem "guard"
+  gem "minitest", "~> 5.0"
   gem "minitest-rg"
   gem "mocha"
   gem "rake", require: false

data/Gemfile.lock

@@ -8,22 +8,22 @@ GIT
 PATH
   remote: .
   specs:
-    roast-ai (0.5.1)
+    roast-ai (0.5.2)
       activesupport (>= 7.0)
-      async (~> 2.34)
-      benchmark (~> 0.4.1)
-      cli-kit (~> 5.2)
-      cli-ui (~> 2.7)
-      diff-lcs (~> 1.5)
-      json-schema
-      open_router (~> 0.3)
+      async (>= 2.34)
+      benchmark (>= 0.4.1)
+      cli-kit (>= 5.2)
+      cli-ui (>= 2.7)
+      diff-lcs (>= 1.5)
+      json-schema (>= 5.1)
+      open_router (>= 0.3)
       raix (~> 1.0.2)
-      rake (~> 13.3.0)
-      ruby-graphviz (~> 1.2)
-      ruby_llm
-      sqlite3 (~> 2.6)
-      thor (~> 1.3)
-      zeitwerk (~> 2.6)
+      rake (>= 13.3.0)
+      ruby-graphviz (>= 1.2)
+      ruby_llm (>= 1.8)
+      sqlite3 (>= 2.6)
+      thor (>= 1.3)
+      zeitwerk (>= 2.6)
 
 GEM
   remote: https://rubygems.org/
@@ -267,6 +267,7 @@ DEPENDENCIES
   cli-ui!
   guard
   guard-minitest
+  minitest (~> 5.0)
   minitest-rg
   mocha
   rake

data/dsl/demo/Gemfile.lock

@@ -1,19 +1,22 @@
 PATH
   remote: ../..
   specs:
-    roast-ai (0.4.9)
+    roast-ai (0.5.1)
       activesupport (>= 7.0)
-      cli-kit (~> 5.0)
-      cli-ui (= 2.3.0)
-      diff-lcs (~> 1.5)
-      json-schema
-      open_router (~> 0.3)
-      raix (~> 1.0.2)
-      ruby-graphviz (~> 1.2)
-      ruby_llm
-      sqlite3 (~> 2.6)
-      thor (~> 1.3)
-      zeitwerk (~> 2.6)
+      async (>= 2.34)
+      benchmark (>= 0.4.1)
+      cli-kit (>= 5.2)
+      cli-ui (>= 2.7)
+      diff-lcs (>= 1.5)
+      json-schema (>= 5.1)
+      open_router (>= 0.3)
+      raix (>= 1.0.2)
+      rake (>= 13.3.0)
+      ruby-graphviz (>= 1.2)
+      ruby_llm (>= 1.8)
+      sqlite3 (>= 2.6)
+      thor (>= 1.3)
+      zeitwerk (>= 2.6)
 
 PATH
   remote: ../plugin-gem-example
@@ -38,14 +41,24 @@ GEM
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    async (2.34.0)
+      console (~> 1.29)
+      fiber-annotation
+      io-event (~> 1.11)
+      metrics (~> 0.12)
+      traces (~> 0.18)
     base64 (0.3.0)
     benchmark (0.4.1)
     bigdecimal (3.3.1)
-    cli-kit (5.0.1)
-      cli-ui (~> 2.0)
-    cli-ui (2.3.0)
+    cli-kit (5.2.0)
+      cli-ui (~> 2.4)
+    cli-ui (2.7.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
+    console (1.34.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     diff-lcs (1.6.2)
     dotenv (3.1.8)
     drb (2.2.3)
@@ -60,14 +73,20 @@ GEM
       net-http (>= 0.5.0)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    io-event (1.14.0)
     json (2.15.1)
     json-schema (6.0.0)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     logger (1.7.0)
     marcel (1.1.0)
+    metrics (0.15.0)
     minitest (5.26.0)
     multipart-post (2.4.1)
     net-http (0.6.0)
@@ -85,6 +104,7 @@ GEM
       open_router (~> 0.2)
       ostruct
       ruby-openai (~> 8.1)
+    rake (13.3.1)
     rexml (3.4.4)
     ruby-graphviz (1.2.5)
       rexml
@@ -104,6 +124,7 @@ GEM
     securerandom (0.4.1)
     sqlite3 (2.7.4-arm64-darwin)
     thor (1.4.0)
+    traces (0.18.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.0.4)

data/dsl/simple_agent.rb

@@ -7,7 +7,7 @@ config do
   agent do
     provider :claude
     model "haiku"
-    initial_prompt "Always respond in haiku form"
+    append_system_prompt "Always respond in haiku form"
     show_prompt!
     dump_raw_agent_messages_to "tmp/claude-messages.log"
   end

data/lib/roast/dsl/cog/config.rb

@@ -242,7 +242,9 @@ module Roast
         # ---
         #
         # __Important Note__: this configuration option only applies to external commands invoked by a cog
-        # It does not affect the working directory in which Roast is running.
+        # It does not affect the working directory in which Roast is running. In fact, changing the working
+        # directory of the Roast process can have unpredictable results when running async cogs and/or
+        # parallel maps.
         #
         # ---
         #

data/lib/roast/dsl/cogs/agent/config.rb

@@ -132,39 +132,83 @@ module Roast
             @values[:model].presence
           end
 
-          # Configure the cog with an initial prompt component that will be appended to the agent's system prompt
+          # Configure the cog with a custom system prompt that will completely replace the agent's
+          # default system prompt every time the agent is invoked
+          #
+          # #### See Also
+          # - `no_replace_system_prompt!`
+          # - `append_system_prompt`
+          #
+          #: (String) -> void
+          def replace_system_prompt(prompt)
+            @values[:replace_system_prompt] = prompt
+          end
+
+          # Configure the cog __not__ to replace the agent's default system prompt
+          #
+          # This is the default behaviour.
+          #
+          # #### See Also
+          # - `replace_system_prompt`
+          #
+          #: () -> void
+          def no_replace_system_prompt!
+            @values[:replace_system_prompt] = ""
+          end
+
+          # Get the validated, configured replacement system prompt
+          #
+          # Returns `nil` if the default system prompt should __not__ be replaced.
+          #
+          # #### See Also
+          # - `replace_system_prompt`
+          # - `no_replace_system_prompt!`
+          #
+          #: () -> String?
+          def valid_replace_system_prompt
+            @values[:replace_system_prompt].presence
+          end
+
+          # Configure the cog with a prompt component that will be appended to the agent's system prompt
           # every time the agent is invoked
           #
+          # Use this to add custom instructions while preserving the provider's default system prompt.
+          #
+          # This can also be combined with with `replace_system_prompt`.
+          #
           # #### See Also
-          # - `no_initial_prompt!`
+          # - `no_append_system_prompt!`
+          # - `replace_system_prompt`
           #
           #: (String) -> void
-          def initial_prompt(prompt)
-            @values[:initial_prompt] = prompt
+          def append_system_prompt(prompt)
+            @values[:append_system_prompt] = prompt
           end
 
-          # Configure the cog __not__ to append an initial prompt to the agent's system prompt when the agent is invoked
+          # Configure the cog __not__ to append anything to the agent's system prompt when the agent is invoked
+          #
+          # This is the default behaviour.
           #
           # #### See Also
-          # - `initial_prompt`
+          # - `append_system_prompt`
           #
           #: () -> void
-          def no_initial_prompt!
-            @values[:initial_prompt] = ""
+          def no_append_system_prompt!
+            @values[:append_system_prompt] = ""
           end
 
-          # Get the validated, configured initial prompt that will be appended to the agent's system prompt when
+          # Get the validated, configured prompt that will be appended to the agent's system prompt when
           # the agent is invoked
           #
           # Returns `nil` if __no__ prompt should be appended.
           #
           # #### See Also
-          # - `initial_prompt`
-          # - `no_initial_prompt!`
+          # - `append_system_prompt`
+          # - `no_append_system_prompt!`
           #
           #: () -> String?
-          def valid_initial_prompt
-            @values[:initial_prompt].presence
+          def valid_append_system_prompt
+            @values[:append_system_prompt].presence
           end
 
           # Configure the cog to apply the default set of system and user permissions when running the agent

data/lib/roast/dsl/cogs/agent/providers/claude/claude_invocation.rb

@@ -58,7 +58,8 @@ module Roast
               def initialize(config, input)
                 @base_command = config.valid_command #: (String | Array[String])?
                 @model = config.valid_model #: String?
-                @append_system_prompt = config.valid_initial_prompt #: String?
+                @append_system_prompt = config.valid_append_system_prompt #: String?
+                @replace_system_prompt = config.valid_replace_system_prompt #: String?
                 @apply_permissions = config.apply_permissions? #: bool
                 @working_directory = config.valid_working_directory #: Pathname?
                 @prompt = input.valid_prompt! #: String
@@ -171,6 +172,7 @@ module Roast
                 end
                 command.push("-p", "--verbose", "--output-format", "stream-json")
                 command.push("--model", @model) if @model
+                command.push("--system-prompt", @replace_system_prompt) if @replace_system_prompt
                 command.push("--append-system-prompt", @append_system_prompt) if @append_system_prompt
                 command.push("--fork-session", "--resume", @session) if @session.present?
                 command << "--dangerously-skip-permissions" unless @apply_permissions

data/lib/roast/dsl/cogs/chat/config.rb

@@ -147,7 +147,7 @@ module Roast
           #
           #: () -> String
           def valid_base_url
-            @values.fetch(:api_key, ENV[PROVIDERS.dig(valid_provider!, :base_url_env_var).not_nil!]) ||
+            @values.fetch(:base_url, ENV[PROVIDERS.dig(valid_provider!, :base_url_env_var).not_nil!]) ||
               PROVIDERS.dig(valid_provider!, :default_base_url)
           end
 

data/lib/roast/dsl/workflow.rb

@@ -11,7 +11,7 @@ module Roast
       class InvalidCogReference < WorkflowError; end
 
       class << self
-        #: (String, WorkflowParams) -> void
+        #: (String | Pathname, WorkflowParams) -> void
         def from_file(workflow_path, params)
           Dir.mktmpdir("roast-") do |tmpdir|
             workflow_context = WorkflowContext.new(params:, tmpdir:)
@@ -22,7 +22,7 @@ module Roast
         end
       end
 
-      #: (String, WorkflowContext) -> void
+      #: (String | Pathname, WorkflowContext) -> void
       def initialize(workflow_path, workflow_context)
         @workflow_path = Pathname.new(workflow_path) #: Pathname
         @workflow_context = workflow_context #: WorkflowContext

data/lib/roast/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Roast
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/roast.rb

@@ -87,8 +87,20 @@ module Roast
         targets, workflow_args, workflow_kwargs = parse_custom_workflow_args(files, ARGV)
         targets.unshift(options[:target]) if options[:target]
         workflow_params = Roast::DSL::WorkflowParams.new(targets, workflow_args, workflow_kwargs)
-        Dir.chdir(ENV["ROAST_WORKING_DIRECTORY"] || Dir.pwd) do
-          Roast::DSL::Workflow.from_file(workflow_path, workflow_params)
+
+        # If the workflow is running with a working directory specified to be different from the current directory
+        # from which Roast was run, and the workflow file if specified with a relative path, check for it relative
+        # to the current directory first, and then relative to the working directory specified for the workflow.
+        roast_working_directory = Pathname.new(File.expand_path(ENV["ROAST_WORKING_DIRECTORY"] || Dir.pwd))
+        workflow_path = Pathname.new(workflow_path)
+        real_workflow_path = if workflow_path.absolute? || workflow_path.exist?
+          workflow_path
+        else
+          roast_working_directory / workflow_path
+        end.realpath
+
+        Dir.chdir(roast_working_directory) do
+          Roast::DSL::Workflow.from_file(real_workflow_path, workflow_params)
         end
       else
         expanded_workflow_path = if workflow_path.include?("workflow.yml")

data/roast-ai.gemspec

@@ -30,18 +30,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("activesupport", ">= 7.0")
-  spec.add_dependency("async", "~> 2.34")
-  spec.add_dependency("benchmark", "~> 0.4.1")
-  spec.add_dependency("cli-kit", "~> 5.2")
-  spec.add_dependency("cli-ui", "~> 2.7")
-  spec.add_dependency("diff-lcs", "~> 1.5")
-  spec.add_dependency("json-schema")
-  spec.add_dependency("open_router", "~> 0.3")
+  spec.add_dependency("async", ">= 2.34")
+  spec.add_dependency("benchmark", ">= 0.4.1")
+  spec.add_dependency("cli-kit", ">= 5.2")
+  spec.add_dependency("cli-ui", ">= 2.7")
+  spec.add_dependency("diff-lcs", ">= 1.5")
+  spec.add_dependency("json-schema", ">= 5.1")
+  spec.add_dependency("open_router", ">= 0.3")
   spec.add_dependency("raix", "~> 1.0.2")
-  spec.add_dependency("rake", "~> 13.3.0") # NOTE: required by Thor
-  spec.add_dependency("ruby-graphviz", "~> 1.2")
-  spec.add_dependency("ruby_llm")
-  spec.add_dependency("sqlite3", "~> 2.6")
-  spec.add_dependency("thor", "~> 1.3")
-  spec.add_dependency("zeitwerk", "~> 2.6")
+  spec.add_dependency("rake", ">= 13.3.0") # NOTE: required by Thor
+  spec.add_dependency("ruby-graphviz", ">= 1.2")
+  spec.add_dependency("ruby_llm", ">= 1.8")
+  spec.add_dependency("sqlite3", ">= 2.6")
+  spec.add_dependency("thor", ">= 1.3")
+  spec.add_dependency("zeitwerk", ">= 2.6")
 end

data/sorbet/rbi/shims/lib/roast/dsl/config_context.rbi

@@ -152,9 +152,11 @@ module Roast
       # - `model(string)` - Set the model to use
       # - `use_default_model!` - Use the provider's default model
       #
-      # #### Configure the initial system prompt
-      # - `initial_prompt(string)` - Set an initial prompt component to append to the agent's system prompt
-      # - `no_initial_prompt!` - Don't append an initial prompt component
+      # #### Configure the system prompt
+      # - `replace_system_prompt(string)` - Completely replace the agent's default system prompt
+      # - `no_replace_system_prompt!` - Don't replace the default system prompt (default)
+      # - `append_system_prompt(string)` - Append a prompt component to the agent's system prompt
+      # - `no_append_system_prompt!` - Don't append to the system prompt (default)
       #
       # #### Configure the working directory
       # - `working_directory(path)` - Set the working directory for agent execution

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roast-ai
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Shopify
@@ -27,70 +27,70 @@ dependencies:
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.34'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: cli-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
   name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -99,26 +99,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: open_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
@@ -139,28 +139,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 13.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 13.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
@@ -169,54 +169,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
 description: Roast is a Ruby library for running structured AI workflows along with