roast-ai 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6062453625ebfdec9aa48a51e5fa8e99deef186142adad84038a6587eba49e5
-  data.tar.gz: c95063f6f8ad36084ee36b73e8830f50147e65970e7005a26eea375e33f1a4a1
+  metadata.gz: 6e2c7eb637034ea1c7a97776161d901ddcce583600bb465fd1f403a4866203c4
+  data.tar.gz: 194f9efd30453dbf123f16abab80bce99cf713dee8077858c10fa3e80c53d7cb
 SHA512:
-  metadata.gz: 8272e051e7a093aa6486d9ece57ec3981a93ca92266464ffc72fb2db85f56bf7f27dd9b9be47b3c327771e384e2fa7758b9172f90e51d88ae36ff7bd3a66ed27
-  data.tar.gz: fd1c2df5ce3fe87049d30212cfcd6d93f5bb79519a0efc2a519a57a6bb1e1b29837aa0cb4ac80f30cebe0cfab5ac40994ce1beaec2f16ee0fdc1db713b0ffcb4
+  metadata.gz: 92f4fc82409d7b59fed96a2ba31ac9c9c4dc9b9744a8645b934223c2fad8f09f5e960dcb8629963af619310516931391b90e0692162dbe42028553e311cb9eb9
+  data.tar.gz: 5d12e5e669c9acc5ac3372f621c2627735c0edaf96bf2c674c56ebbee458b69d3c1fc3dea30073045541e06b01c6ece526bcd597de184e5ea6b84fca8a67f2cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roast-ai (1.2.0)
+    roast-ai (1.3.0)
       activesupport (~> 8.0)
       async (>= 2.34)
       rainbow (>= 3.0.0)
@@ -193,8 +193,8 @@ GEM
       rexml (>= 3.2.6)
       sorbet-static-and-runtime (>= 0.5.10187)
       thor (>= 0.19.2)
-    sqlite3 (2.9.0-arm64-darwin)
-    sqlite3 (2.9.0-x86_64-linux-gnu)
+    sqlite3 (2.9.5-arm64-darwin)
+    sqlite3 (2.9.5-x86_64-linux-gnu)
     tapioca (0.17.10)
       benchmark
       bundler (>= 2.2.25)
@@ -224,7 +224,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.42)
+    yard (0.9.44)
     yard-sorbet (0.9.0)
       sorbet-runtime
       yard
@@ -317,7 +317,7 @@ CHECKSUMS
   regexp_parser (2.10.0) sha256=cb6f0ddde88772cd64bff1dbbf68df66d376043fe2e66a9ef77fcb1b0c548c61
   require-hooks (0.2.3) sha256=224be5b4be0fd2a47cb73286c500da366704a54ec195b6627366380c950efac8
   rexml (3.4.2) sha256=1384268554a37af5da5279431ca3f2f37d46f09ffdd6c95e17cc84c83ea7c417
-  roast-ai (1.2.0)
+  roast-ai (1.3.0)
   rubocop (1.77.0) sha256=1f360b4575ef7a124be27b0dfffa227a2b2d9420d22d4fd8bf179d702bcc88c0
   rubocop-ast (1.45.1) sha256=94042e49adc17f187ba037b33f941ba7398fede77cdf4bffafba95190a473a3e
   rubocop-shopify (2.17.1) sha256=03850eb1a9c4d1f9f0ac1d8d5aa51bb47a149e532cfb5e8d02ac6a90c8800a5f
@@ -337,8 +337,8 @@ CHECKSUMS
   sorbet-static (0.6.12984-x86_64-linux) sha256=39c03af15badb204d640fbc6398bee171f4026377f31cba08cdb381091159c57
   sorbet-static-and-runtime (0.6.12984) sha256=281b39ef61aee83551333df581a8d53737bc39df19e09e9cbe01ca8f8b93826f
   spoom (1.7.11) sha256=4e27384af6d3fde5aadc0287c51e6f76c0802259cbb3b6a67603bf718352f4cf
-  sqlite3 (2.9.0-arm64-darwin) sha256=a917bd9b84285766ff3300b7d79cd583f5a067594c8c1263e6441618c04a6ed3
-  sqlite3 (2.9.0-x86_64-linux-gnu) sha256=72fff9bd750070ba3af695511ba5f0e0a2d8a9206f84869640b3e99dfaf3d5a5
+  sqlite3 (2.9.5-arm64-darwin) sha256=d0cf444a70fc9395d513cfbcc1e6719e224aa645314e3824cb0474c721425aa2
+  sqlite3 (2.9.5-x86_64-linux-gnu) sha256=233dbcb6714148dd23bc5aeb33e8efd6eac974969564ddd5794c23d5f52b231e
   tapioca (0.17.10) sha256=880a682ca8314f798dd09e9f104134fbf1a713c13be51f7dd4741dd434e6471b
   thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d
   traces (0.18.2) sha256=80f1649cb4daace1d7174b81f3b3b7427af0b93047759ba349960cb8f315e214
@@ -350,7 +350,7 @@ CHECKSUMS
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
   vcr (6.3.1) sha256=37b56e157e720446a3f4d2d39919cabef8cb7b6c45936acffd2ef8229fec03ed
   webmock (3.25.1) sha256=ab9d5d9353bcbe6322c83e1c60a7103988efc7b67cd72ffb9012629c3d396323
-  yard (0.9.42) sha256=4e2be01f8623556093497731d44c801e600d7c9759ec7a35a2dd5dd83bbbba68
+  yard (0.9.44) sha256=eb087e9b631ccd887b049f303d489963945452d5e2a7eb49a5a74a7cf6887f28
   yard-sorbet (0.9.0) sha256=03d1aa461b9e9c82b886919a13aa3e09fcf4d1852239d2967ed97e92723ffe21
   zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
 

data/README.md

@@ -9,7 +9,7 @@ A Ruby-based domain-specific language for creating structured AI workflows. Buil
 Roast lets you orchestrate AI workflows by combining "cogs" - building blocks that interact with LLMs, run code, execute commands, and process data. Write workflows that:
 
 - **Chain AI steps together** - Output from one cog flows seamlessly to the next
-- **Run coding agents locally** - Full filesystem access with Claude Code or other providers
+- **Run coding agents locally** - Full filesystem access with Pi, Claude Code, or other providers
 - **Process collections** - Map operations over arrays with serial or parallel execution
 - **Control flow intelligently** - Conditional execution, iteration, and error handling
 - **Reuse workflow components** - Create modular, parameterized scopes
@@ -47,8 +47,8 @@ bin/roast execute analyze_codebase.rb
 
 ## Core Cogs
 
-- **`chat`** - Send prompts to cloud-based LLMs (OpenAI, Anthropic, Perplexity & Gemini)
-- **`agent`** - Run local coding agents with filesystem access (Claude Code CLI, etc.)
+- **`chat`** - Send prompts to cloud-based LLMs (OpenAI, Anthropic, Perplexity, Gemini & Amazon Bedrock)
+- **`agent`** - Run local coding agents with filesystem access (Pi CLI, Claude Code CLI, etc.)
 - **`ruby`** - Execute custom Ruby code within workflows
 - **`cmd`** - Run shell commands and capture output
 - **`map`** - Process collections in serial or parallel
@@ -70,34 +70,45 @@ gem 'roast-ai'
 
 - Ruby 3.0+
 - API keys or local credentials for your AI provider
-- Claude Code CLI installed (for the default agent provider)
+- Pi CLI installed (for the default agent provider)
 
 ## Provider Configuration
 
-Roast provider settings are configured in workflow `config` blocks. There is not currently a CLI flag or environment variable that changes the default provider globally; edit the workflow config to select a different provider.
+Roast provider settings are configured in workflow `config` blocks. To change the default **chat** provider without editing each workflow, set the `ROAST_DEFAULT_CHAT_PROVIDER` environment variable (e.g. `export ROAST_DEFAULT_CHAT_PROVIDER=anthropic`). To change the default **agent** provider, set `ROAST_DEFAULT_AGENT_PROVIDER`. A `provider` set in a workflow's `config` always takes precedence over these variables, and an invalid value raises an error.
 
 ### Chat cog
 
-The `chat` cog currently supports the OpenAI provider. It uses `OPENAI_API_KEY` by default, and `OPENAI_API_BASE` can override the default base URL (`https://api.openai.com/v1`).
+The `chat` cog supports **OpenAI**, **Anthropic**, **Perplexity**, **Gemini**, and **Amazon Bedrock**. It defaults to `:openai` (override globally with `ROAST_DEFAULT_CHAT_PROVIDER`). Each provider reads its API key from a provider-specific environment variable:
+
+| Provider | API key env var | Base URL env var |
+|---|---|---|
+| `:openai` | `OPENAI_API_KEY` | `OPENAI_API_BASE` |
+| `:anthropic` | `ANTHROPIC_API_KEY` | `ANTHROPIC_API_BASE` |
+| `:perplexity` | `PERPLEXITY_API_KEY` | — |
+| `:gemini` | `GEMINI_API_KEY` | `GEMINI_API_BASE` |
+| `:bedrock` | `AWS_ACCESS_KEY_ID` | — |
+
+The `:bedrock` provider also reads `AWS_SECRET_ACCESS_KEY`, `AWS_SESSION_TOKEN` (for temporary credentials) and `AWS_REGION` from the environment. It does not read AWS profiles. It reads every credential from the environment, so do not use `api_key` with `:bedrock`: it replaces only the access key ID and can pair it with a mismatched `AWS_SECRET_ACCESS_KEY`. The default model is a `us.` inference profile, so accounts outside the US must set `model` in the `chat` config block. To use AWS SSO, export temporary credentials first:
 
 ```bash
-export OPENAI_API_KEY=...
+eval "$(aws configure export-credentials --profile my-profile --format env)"
+export AWS_REGION=us-west-2
 ```
 
-You can also configure chat settings directly in a workflow:
+You can configure the provider directly in a workflow:
 
 ```ruby
 config do
   chat do
-    provider :openai
-    model "gpt-4o-mini"
+    provider :anthropic
+    model "claude-haiku-4-5"
   end
 end
 ```
 
 ### Agent cog
 
-The `agent` cog runs local agent CLIs. It defaults to `:claude` and currently supports:
+The `agent` cog runs local agent CLIs. It defaults to `:pi` (override globally with `ROAST_DEFAULT_AGENT_PROVIDER`) and currently supports:
 
 - `:claude` - Claude Code CLI
 - `:pi` - Pi CLI
@@ -116,14 +127,14 @@ Agent providers must be installed and authenticated according to their own CLI r
 
 ## Configuration
 
-Roast currently supports four LLM providers for the `chat` cog: **OpenAI**, **Anthropic**, **Perplexity** and **Gemini**.
+Roast currently supports five LLM providers for the `chat` cog: **OpenAI**, **Anthropic**, **Perplexity**, **Gemini** and **Amazon Bedrock**.
 
-- Set `OPENAI_API_KEY`, `ANTHROPIC_API_KEY`, `PERPLEXITY_API_KEY` and/or `GEMINI_API_KEY` in your environment.
+- Set `OPENAI_API_KEY`, `ANTHROPIC_API_KEY`, `PERPLEXITY_API_KEY` and/or `GEMINI_API_KEY` in your environment. For Bedrock, set `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` instead.
 - Optionally set `OPENAI_API_BASE`, `ANTHROPIC_API_BASE` and/or `GEMINI_API_BASE` to override the default endpoint. Perplexity does not support base URL override.
 
 The default model is set per-provider and can only be overridden inside a `config` block. See the [tutorial](https://github.com/Shopify/roast/blob/main/tutorial/01_your_first_workflow/README.md#adding-configuration) for examples.
 
-The `agent` cog is powered by the Claude Code CLI by default, which handles its own authentication.
+The `agent` cog is powered by the Pi CLI by default, which handles its own authentication.
 
 ## Getting Started
 
@@ -159,6 +170,7 @@ class and method comments on the relevant classes.
     * [Additional Example Workflows]([https://github.com/Shopify/roast/tree/main/examples](https://github.com/Shopify/roast/tree/main/examples)) (these comprise the Roast end-to-end test suite)
 * __Configuation__
     * [General configuration block: `config-context.rbi`](https://github.com/Shopify/roast/blob/main/sorbet/rbi/shims/lib/roast/config_context.rbi)
+    * [Workflow params in cog config blocks: `cog/config.rbi`](https://github.com/Shopify/roast/blob/main/sorbet/rbi/shims/lib/roast/cog/config.rbi)
     * [Global cog configuration: `cog/config.rb`](https://github.com/Shopify/roast/blob/main/lib/roast/cog/config.rb)
     * [Agent cog configuration: `agent/config.rb`](https://github.com/Shopify/roast/blob/main/lib/roast/cogs/agent/config.rb)
     * [Chat cog configuration: `chat/config.rb`](https://github.com/Shopify/roast/blob/main/lib/roast/cogs/chat/config.rb)

data/examples/demo/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    roast-ai (1.2.0)
+    roast-ai (1.3.0)
       activesupport (~> 8.0)
       async (>= 2.34)
       rainbow (>= 3.0.0)
@@ -66,7 +66,7 @@ GEM
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     io-event (1.14.0)
-    json (2.20.0)
+    json (2.21.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)

data/examples/plugin-gem-example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    roast-ai (1.2.0)
+    roast-ai (1.3.0)
       activesupport (~> 8.0)
       async (>= 2.34)
       rainbow (>= 3.0.0)
@@ -51,13 +51,13 @@ GEM
     drb (2.2.3)
     erb (6.0.1.1)
     event_stream_parser (1.0.0)
-    faraday (2.14.2)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
@@ -73,7 +73,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.5)
+    json (2.21.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)

data/examples/simple_agent.rb

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

data/examples/targets_and_params.rb

@@ -4,6 +4,18 @@
 #: self as Roast::Workflow
 
 config do
+  # Workflow params are available inside cog config blocks and the `global` block, so you can
+  # configure cogs based on how the workflow was invoked.
+  chat do
+    # e.g., pick a cheaper model when the workflow is invoked with the `fast` flag:
+    #   roast execute examples/targets_and_params.rb -- fast
+    model(arg?(:fast) ? "gpt-5.4-nano" : "gpt-5")
+  end
+
+  # `global` config applies to every cog; the same param accessors work here too.
+  global do
+    abort_on_failure! if arg?(:strict)
+  end
 end
 
 execute do

data/internal/documentation/comments/doc-comments-external.md

@@ -165,7 +165,8 @@ shortened names can be confusing. Use the complete module path.
 ```ruby
 # Configure the cog to use the default provider when invoking an agent
 #
-# The default provider used by Roast is Anthropic Claude Code (`:claude`).
+# The default provider is the one named by the `ROAST_DEFAULT_AGENT_PROVIDER` environment variable,
+# or Pi (`:pi`) when that variable is unset.
 #: () -> void
 def use_default_provider!
   @values[:provider] = nil
@@ -386,7 +387,8 @@ end
 # Configure the cog to use a specified provider when invoking an agent
 #
 # The provider is the source of the agent tool itself.
-# If no provider is specified, Anthropic Claude Code (`:claude`) will be used as the default provider.
+# If no provider is specified, Roast uses the provider named by the `ROAST_DEFAULT_AGENT_PROVIDER`
+# environment variable, or Pi (`:pi`) when that variable is unset.
 #
 # A provider must be properly installed on your system in order for Roast to be able to use it.
 #
@@ -519,7 +521,7 @@ Methods in `config_context.rbi` expose cog configuration interfaces and are the
 #
 # #### Configure the LLM provider
 # - `provider(symbol)` - Set the agent provider (e.g., `:claude`)
-# - `use_default_provider!` - Use the default provider (`:claude`)
+# - `use_default_provider!` - Use the default provider (`:pi`, or `$ROAST_DEFAULT_AGENT_PROVIDER` when set)
 #
 # #### Configure the base command used to run the coding agent
 # - `command(string_or_array)` - Set the base command for invoking the agent

data/internal/documentation/comments/doc-comments.md

@@ -70,7 +70,8 @@ These files provide the primary interface between users and Roast. The documenta
 # Configure the cog to use a specified provider when invoking an agent
 #
 # The provider is the source of the agent tool itself.
-# If no provider is specified, Anthropic Claude Code (`:claude`) will be used as the default provider.
+# If no provider is specified, Roast uses the provider named by the `ROAST_DEFAULT_AGENT_PROVIDER`
+# environment variable, or Pi (`:pi`) when that variable is unset.
 #
 # A provider must be properly installed on your system in order for Roast to be able to use it.
 #

data/lib/roast/cog_input_manager.rb

@@ -4,6 +4,8 @@
 module Roast
   # Context in which an individual cog block within the `execute` block of a workflow is evaluated
   class CogInputManager
+    include WorkflowParamAccessors
+
     class CogOutputAccessError < Roast::Error; end
 
     class CogDoesNotExistError < CogOutputAccessError; end
@@ -104,50 +106,6 @@ module Roast
       end
     end
 
-    #: () -> String
-    def target!
-      raise ArgumentError, "expected exactly one target" unless @workflow_context.params.targets.length == 1
-
-      @workflow_context.params.targets.first #: as String
-    end
-
-    #: () -> Array[String]
-    def targets
-      @workflow_context.params.targets.dup
-    end
-
-    #: (Symbol) -> bool
-    def arg?(value)
-      @workflow_context.params.args.include?(value)
-    end
-
-    #: () -> Array[Symbol]
-    def args
-      @workflow_context.params.args.dup
-    end
-
-    #: (Symbol) -> String?
-    def kwarg(key)
-      @workflow_context.params.kwargs[key]
-    end
-
-    #: (Symbol) -> String
-    def kwarg!(key)
-      raise ArgumentError, "expected keyword argument '#{key}' to be present" unless @workflow_context.params.kwargs.include?(key)
-
-      @workflow_context.params.kwargs[key] #: as String
-    end
-
-    #: (Symbol) -> bool
-    def kwarg?(key)
-      @workflow_context.params.kwargs.include?(key)
-    end
-
-    #: () -> Hash[Symbol, String]
-    def kwargs
-      @workflow_context.params.kwargs.dup
-    end
-
     #: () -> Pathname
     def tmpdir
       Pathname.new(@workflow_context.tmpdir).realpath

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

@@ -5,12 +5,21 @@ module Roast
   module Cogs
     class Agent < Cog
       class Config < Cog::Config
-        VALID_PROVIDERS = [:claude, :pi].freeze #: Array[Symbol]
+        VALID_PROVIDERS = [:pi, :claude].freeze #: Array[Symbol]
+
+        # Environment variable that overrides the built-in default agent provider.
+        #
+        # When an agent cog does not explicitly configure a provider, Roast uses the provider named by
+        # this variable, falling back to the built-in default (`VALID_PROVIDERS.first`, i.e. `:pi`) when it
+        # is unset or blank. The value is normalized (surrounding whitespace stripped, then downcased)
+        # before lookup, and an explicit `provider` configured on the cog always takes precedence over it.
+        DEFAULT_PROVIDER_ENV_VAR = "ROAST_DEFAULT_AGENT_PROVIDER" #: String
 
         # Configure the cog to use a specified provider when invoking an agent
         #
         # The provider is the source of the agent tool itself.
-        # If no provider is specified, Anthropic Claude Code (`:claude`) will be used as the default provider.
+        # If no provider is specified, Roast uses the provider named by the `ROAST_DEFAULT_AGENT_PROVIDER`
+        # environment variable, or Pi (`:pi`) when that variable is unset.
         #
         # A provider must be properly installed on your system in order for Roast to be able to use it.
         #
@@ -24,7 +33,8 @@ module Roast
 
         # Configure the cog to use the default provider when invoking an agent
         #
-        # The default provider used by Roast is Anthropic Claude Code (`:claude`).
+        # The default provider is the one named by the `ROAST_DEFAULT_AGENT_PROVIDER` environment variable,
+        # or Pi (`:pi`) when that variable is unset.
         #
         # The provider must be properly installed on your system in order for Roast to be able to use it.
         #
@@ -38,6 +48,10 @@ module Roast
 
         # Get the validated provider name that the cog is configured to use when invoking an agent
         #
+        # The provider is resolved in order of precedence: the provider explicitly configured on the cog,
+        # then the `ROAST_DEFAULT_AGENT_PROVIDER` environment variable (normalized by stripping surrounding
+        # whitespace and downcasing), then the built-in default (`VALID_PROVIDERS.first`, i.e. `:pi`).
+        #
         # Note: this method will return the name of a valid provider or raise an `InvalidConfigError`.
         # It will __not__, however, validate that the agent is properly installed on your system.
         # If the agent is not properly installed, you will likely experience a failure when Roast attempts to
@@ -49,7 +63,8 @@ module Roast
         #
         #: () -> Symbol
         def valid_provider!
-          provider = @values[:provider] || VALID_PROVIDERS.first
+          env_default = ENV[DEFAULT_PROVIDER_ENV_VAR].presence&.strip&.downcase&.to_sym
+          provider = @values[:provider] || env_default || VALID_PROVIDERS.first
           unless VALID_PROVIDERS.include?(provider)
             raise InvalidConfigError, "'#{provider}' is not a valid provider. Available providers include: #{VALID_PROVIDERS.join(", ")}"
           end
@@ -131,6 +146,47 @@ module Roast
           @values[:model].presence
         end
 
+        # Configure the cog to stop the agent if it runs longer than the given number of seconds
+        #
+        # When the limit is reached, the agent process is killed and the cog raises
+        # `Roast::CommandRunner::TimeoutError`. By default there is no timeout.
+        #
+        # #### See Also
+        # - `no_timeout!`
+        #
+        #: (Integer) -> void
+        def timeout(seconds)
+          @values[:timeout] = seconds
+        end
+
+        # Configure the cog to let the agent run for as long as it takes (the default)
+        #
+        # #### See Also
+        # - `timeout`
+        #
+        #: () -> void
+        def no_timeout!
+          @values[:timeout] = nil
+        end
+
+        # Get the validated number of seconds the agent may run before it is stopped
+        #
+        # Returns `nil` if the agent has no timeout. Raises an `InvalidConfigError` if the configured
+        # timeout is not positive.
+        #
+        # #### See Also
+        # - `timeout`
+        # - `no_timeout!`
+        #
+        #: () -> Integer?
+        def valid_timeout
+          seconds = @values[:timeout]
+          return if seconds.nil?
+          return seconds if seconds.positive?
+
+          raise InvalidConfigError, "timeout must be a positive number of seconds, got #{seconds.inspect}"
+        end
+
         # Configure the cog with a custom system prompt that will completely replace the agent's
         # default system prompt every time the agent is invoked
         #

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

@@ -56,11 +56,14 @@ module Roast
             #: (Agent::Config, String, String?, ?fork_session: bool) -> void
             def initialize(config, prompt, session, fork_session: true)
               @base_command = config.valid_command #: (String | Array[String])?
-              @model = config.valid_model #: String?
+              # The Claude CLI expects a bare model name, while Pi expects a fully-qualified
+              # `anthropic/<model>` id. Strip the prefix so the same model string works for either provider.
+              @model = config.valid_model&.delete_prefix("anthropic/") #: 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?
+              @timeout = config.valid_timeout #: Integer?
               @context = Context.new #: Context
               @result = Result.new #: Result
               @raw_dump_file = config.valid_dump_raw_agent_messages_to_path #: Pathname?
@@ -82,6 +85,7 @@ module Roast
                 command_line,
                 working_directory: @working_directory,
                 stdin_content: @prompt,
+                timeout: @timeout,
                 stdout_handler: lambda { |line| handle_stdout(line) },
               )