Compare commits
3 Commits
9277646a4b
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 65a44ca150 | |||
| f4bf4eb625 | |||
| 49a161632e |
58
.github/workflows/release.yml
vendored
58
.github/workflows/release.yml
vendored
@@ -6,7 +6,57 @@ on:
|
|||||||
- "v*"
|
- "v*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
verify:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
ruby: ["3.2", "3.3", "3.4", "4.0"]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
|
||||||
|
- name: Set up Ruby ${{ matrix.ruby }}
|
||||||
|
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0
|
||||||
|
with:
|
||||||
|
ruby-version: ${{ matrix.ruby }}
|
||||||
|
bundler-cache: true
|
||||||
|
|
||||||
|
- name: Verify tag matches gem version
|
||||||
|
env:
|
||||||
|
RELEASE_TAG: ${{ github.ref_name }}
|
||||||
|
run: >-
|
||||||
|
ruby -Ilib -ropencode/version -e
|
||||||
|
'expected = ENV.fetch("RELEASE_TAG").delete_prefix("v");
|
||||||
|
abort "tag #{expected.inspect} does not match gem #{Opencode::VERSION.inspect}"
|
||||||
|
unless Opencode::VERSION == expected'
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: bundle exec rake test
|
||||||
|
|
||||||
|
- name: Build gem
|
||||||
|
run: gem build opencode-ruby.gemspec
|
||||||
|
|
||||||
|
- name: Verify gem loads after install
|
||||||
|
run: |
|
||||||
|
bundle_gem_path="$(bundle exec ruby -e 'puts Gem.path.join(":")')"
|
||||||
|
export GEM_HOME="${RUNNER_TEMP}/opencode-ruby-${{ matrix.ruby }}"
|
||||||
|
export GEM_PATH="${GEM_HOME}:${bundle_gem_path}"
|
||||||
|
mkdir -p "$GEM_HOME"
|
||||||
|
gem_file="opencode-ruby-$(ruby -Ilib -ropencode/version -e 'print Opencode::VERSION').gem"
|
||||||
|
gem install --local "$gem_file" --no-document
|
||||||
|
ruby -ropencode-ruby -e '
|
||||||
|
root = File.realpath(ENV.fetch("GEM_HOME"))
|
||||||
|
path = File.realpath(Gem.loaded_specs.fetch("opencode-ruby").full_gem_path)
|
||||||
|
abort "opencode-ruby loaded outside isolated GEM_HOME: #{path}" unless path.start_with?("#{root}/")
|
||||||
|
puts Opencode::VERSION
|
||||||
|
'
|
||||||
|
|
||||||
push:
|
push:
|
||||||
|
needs: verify
|
||||||
if: ${{ github.server_url == 'https://github.com' }}
|
if: ${{ github.server_url == 'https://github.com' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
@@ -21,12 +71,4 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ruby-version: "4.0"
|
ruby-version: "4.0"
|
||||||
bundler-cache: true
|
bundler-cache: true
|
||||||
- name: Verify tag matches gem version
|
|
||||||
env:
|
|
||||||
RELEASE_TAG: ${{ github.ref_name }}
|
|
||||||
run: >-
|
|
||||||
ruby -Ilib -ropencode/version -e
|
|
||||||
'expected = ENV.fetch("RELEASE_TAG").delete_prefix("v");
|
|
||||||
abort "tag #{expected.inspect} does not match gem #{Opencode::VERSION.inspect}"
|
|
||||||
unless Opencode::VERSION == expected'
|
|
||||||
- uses: rubygems/release-gem@052cc82692552de3ef2b81fd670e41d13cba8092 # v1.4.0
|
- uses: rubygems/release-gem@052cc82692552de3ef2b81fd670e41d13cba8092 # v1.4.0
|
||||||
|
|||||||
18
CHANGELOG.md
18
CHANGELOG.md
@@ -1,6 +1,6 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 0.0.1.alpha8 - 2026-07-20
|
## 0.0.1.alpha9 - 2026-07-20
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
@@ -8,6 +8,15 @@
|
|||||||
with or without the optional leading space; join multiple `data:` fields;
|
with or without the optional leading space; join multiple `data:` fields;
|
||||||
ignore the stream's optional leading UTF-8 BOM and comment fields; and decode
|
ignore the stream's optional leading UTF-8 BOM and comment fields; and decode
|
||||||
correctly when a transport chunk splits any byte of the event framing.
|
correctly when a transport chunk splits any byte of the event framing.
|
||||||
|
- Keep request instrumentation free of query credentials and private workspace
|
||||||
|
paths.
|
||||||
|
- Load non-empty todo events and written-file artifacts in standalone Ruby
|
||||||
|
clients.
|
||||||
|
- Bound reconnects after an interactive prompt loses its event stream, handle
|
||||||
|
DNS failures as transient stream errors, and map non-404 4xx responses to
|
||||||
|
`BadRequestError` consistently.
|
||||||
|
- Retry the Rails recovery recipe with its replacement session and keep
|
||||||
|
exception details out of user-facing message content.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@@ -16,6 +25,13 @@
|
|||||||
- Fail the trusted-publishing job before release when the pushed tag does not
|
- Fail the trusted-publishing job before release when the pushed tag does not
|
||||||
match `Opencode::VERSION`.
|
match `Opencode::VERSION`.
|
||||||
|
|
||||||
|
## 0.0.1.alpha8 - 2026-07-20
|
||||||
|
|
||||||
|
### Yanked
|
||||||
|
|
||||||
|
- Published from the unrepaired alpha8 source by mistake and yanked the same
|
||||||
|
day. Use alpha9, which contains the intended alpha8 fixes and release gates.
|
||||||
|
|
||||||
## 0.0.1.alpha7 - 2026-07-18
|
## 0.0.1.alpha7 - 2026-07-18
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -202,7 +202,8 @@ Want every OpenCode endpoint auto-generated from the OpenAPI spec? Use [`opencod
|
|||||||
## Compatibility
|
## Compatibility
|
||||||
|
|
||||||
- Ruby ≥ 3.2
|
- Ruby ≥ 3.2
|
||||||
- Runtime dependency: `activesupport (>= 6.1)` — *not* Rails. ActiveSupport is a standalone helpers gem (`blank?`, `present?`, `presence`, `truncate`, etc.).
|
- Runtime dependency: `activesupport (>= 6.1, < 9.0)` — *not* Rails. ActiveSupport is a standalone helpers gem (`blank?`, `present?`, `presence`, `truncate`, etc.).
|
||||||
|
- Runtime dependency: `marcel (~> 1.0)` for artifact MIME type detection.
|
||||||
|
|
||||||
OpenCode server compatibility is evidence-based, not an open-ended SemVer
|
OpenCode server compatibility is evidence-based, not an open-ended SemVer
|
||||||
promise. OpenCode's HTTP, SSE, and runtime behavior can change independently
|
promise. OpenCode's HTTP, SSE, and runtime behavior can change independently
|
||||||
@@ -236,13 +237,14 @@ The smoke suite covers Client end-to-end against WebMock-stubbed OpenCode
|
|||||||
endpoints, including subscription-before-prompt ordering and
|
endpoints, including subscription-before-prompt ordering and
|
||||||
reconnect-without-repost.
|
reconnect-without-repost.
|
||||||
|
|
||||||
The repository contains a tag-triggered `release.yml` workflow intended for
|
The mistakenly published `0.0.1.alpha8` package contained unrepaired source and
|
||||||
RubyGems trusted publishing, but its RubyGems trusted-publisher registration is
|
was yanked; use `0.0.1.alpha9` or later. The repository contains a tag-triggered
|
||||||
not configured as of `0.0.1.alpha7`; that release was published manually. A
|
`release.yml` workflow intended for RubyGems trusted publishing, but its
|
||||||
`v*` tag push therefore does not currently guarantee publication. Before a
|
trusted-publisher registration is not confirmed for alpha9. A `v*` tag push
|
||||||
future release, verify the RubyGems registry result explicitly. Once the
|
therefore does not currently guarantee publication. Before a future release,
|
||||||
workflow is registered as a trusted publisher for the `release` environment,
|
verify the RubyGems registry result explicitly. Once the workflow is registered
|
||||||
it can build, attest, and publish without a long-lived RubyGems API key.
|
as a trusted publisher for the `release` environment, it can build, attest, and
|
||||||
|
publish without a long-lived RubyGems API key.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
@@ -128,12 +128,13 @@ class GenerateAssistantReplyJob < ApplicationJob
|
|||||||
end
|
end
|
||||||
rescue Opencode::SessionNotFoundError, Opencode::StaleSessionError
|
rescue Opencode::SessionNotFoundError, Opencode::StaleSessionError
|
||||||
raise if attempted_recreate
|
raise if attempted_recreate
|
||||||
message.conversation.recreate_opencode_session!(client)
|
session_id = message.conversation.recreate_opencode_session!(client)
|
||||||
attempted_recreate = true
|
attempted_recreate = true
|
||||||
retry
|
retry
|
||||||
end
|
end
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
message&.update!(status: :errored, content: "An error occurred: #{e.message.truncate(200)}")
|
Rails.logger.error(e.full_message)
|
||||||
|
message&.update!(status: :errored, content: "An error occurred. Please try again.")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -6,8 +6,10 @@
|
|||||||
# non-Rails apps.
|
# non-Rails apps.
|
||||||
require "active_support/core_ext/object/blank" # provides blank?, present?, presence
|
require "active_support/core_ext/object/blank" # provides blank?, present?, presence
|
||||||
require "active_support/core_ext/object/duplicable"
|
require "active_support/core_ext/object/duplicable"
|
||||||
|
require "active_support/core_ext/hash/keys" # provides Hash#deep_stringify_keys
|
||||||
require "active_support/core_ext/string/filters" # provides String#truncate
|
require "active_support/core_ext/string/filters" # provides String#truncate
|
||||||
require "active_support/core_ext/numeric/bytes" # provides Integer#megabytes
|
require "active_support/core_ext/numeric/bytes" # provides Integer#megabytes
|
||||||
|
require "marcel"
|
||||||
|
|
||||||
require_relative "opencode/version"
|
require_relative "opencode/version"
|
||||||
require_relative "opencode/error"
|
require_relative "opencode/error"
|
||||||
|
|||||||
@@ -230,18 +230,12 @@ module Opencode
|
|||||||
request = Net::HTTP::Get.new(uri)
|
request = Net::HTTP::Get.new(uri)
|
||||||
add_auth_header(request)
|
add_auth_header(request)
|
||||||
|
|
||||||
response = Opencode::Instrumentation.instrument("opencode.request", method: request.method, path: request.path) do
|
response = Opencode::Instrumentation.instrument("opencode.request", method: request.method, path: uri.path) do
|
||||||
http_client.request(request)
|
http_client.request(request)
|
||||||
end
|
end
|
||||||
|
|
||||||
unless response.code.to_i.between?(200, 299)
|
body = handle_response(response)
|
||||||
raise ServerError, "list_questions failed: HTTP #{response.code} — #{response.body.to_s[0, 200]}"
|
body.is_a?(Array) ? body : []
|
||||||
end
|
|
||||||
|
|
||||||
return [] if response.body.blank?
|
|
||||||
JSON.parse(response.body, symbolize_names: true)
|
|
||||||
rescue JSON::ParserError => e
|
|
||||||
raise ServerError, "list_questions returned invalid JSON: #{e.message}"
|
|
||||||
rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout => e
|
rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout => e
|
||||||
raise TimeoutError, "OpenCode timeout after #{@timeout}s: #{e.message}"
|
raise TimeoutError, "OpenCode timeout after #{@timeout}s: #{e.message}"
|
||||||
rescue Errno::ECONNREFUSED, SocketError => e
|
rescue Errno::ECONNREFUSED, SocketError => e
|
||||||
@@ -267,7 +261,8 @@ module Opencode
|
|||||||
Net::ReadTimeout,
|
Net::ReadTimeout,
|
||||||
Errno::ECONNREFUSED,
|
Errno::ECONNREFUSED,
|
||||||
Errno::ECONNRESET,
|
Errno::ECONNRESET,
|
||||||
Errno::EPIPE
|
Errno::EPIPE,
|
||||||
|
SocketError
|
||||||
].freeze
|
].freeze
|
||||||
|
|
||||||
# Opens SSE connection to GET /event, yields parsed events filtered by session_id.
|
# Opens SSE connection to GET /event, yields parsed events filtered by session_id.
|
||||||
@@ -334,7 +329,7 @@ module Opencode
|
|||||||
|
|
||||||
loop do
|
loop do
|
||||||
now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
||||||
deadline = check_deadline_or_suspend(now, deadline, timeout, reply)
|
deadline = check_deadline(now, deadline, timeout)
|
||||||
|
|
||||||
# NOTE: first_event_deadline is *not* suspension-eligible. If the agent
|
# NOTE: first_event_deadline is *not* suspension-eligible. If the agent
|
||||||
# never gets started we want to fail fast — a session that's blocked on
|
# never gets started we want to fail fast — a session that's blocked on
|
||||||
@@ -361,6 +356,7 @@ module Opencode
|
|||||||
http.read_timeout = 30
|
http.read_timeout = 30
|
||||||
|
|
||||||
subscription_callback_error = nil
|
subscription_callback_error = nil
|
||||||
|
event_callback_error = nil
|
||||||
subscription_ready = on_subscribed.nil?
|
subscription_ready = on_subscribed.nil?
|
||||||
begin
|
begin
|
||||||
buffer = String.new
|
buffer = String.new
|
||||||
@@ -448,14 +444,19 @@ module Opencode
|
|||||||
# that's the whole point: a healthy long wait (user thinking
|
# that's the whole point: a healthy long wait (user thinking
|
||||||
# for 30 minutes) keeps the container warm via heartbeats so
|
# for 30 minutes) keeps the container warm via heartbeats so
|
||||||
# the reaper doesn't kill it mid-wait.
|
# the reaper doesn't kill it mid-wait.
|
||||||
on_activity_tick&.call(event)
|
begin
|
||||||
block.call(event)
|
on_activity_tick&.call(event)
|
||||||
|
block.call(event)
|
||||||
|
rescue StandardError => error
|
||||||
|
event_callback_error = error
|
||||||
|
raise
|
||||||
|
end
|
||||||
return if terminal_session_event?(event)
|
return if terminal_session_event?(event)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue *TRANSIENT_SSE_ERRORS
|
rescue *TRANSIENT_SSE_ERRORS
|
||||||
raise if subscription_callback_error
|
raise if subscription_callback_error || event_callback_error
|
||||||
|
|
||||||
# Treat transport-level SSE disconnects like clean EOF: reconnect
|
# Treat transport-level SSE disconnects like clean EOF: reconnect
|
||||||
# until an idle session event, the overall timeout, or first-event
|
# until an idle session event, the overall timeout, or first-event
|
||||||
@@ -514,6 +515,11 @@ module Opencode
|
|||||||
# the prompt resolves. Otherwise apply the normal deadline check.
|
# the prompt resolves. Otherwise apply the normal deadline check.
|
||||||
def check_deadline_or_suspend(now, deadline, timeout, reply)
|
def check_deadline_or_suspend(now, deadline, timeout, reply)
|
||||||
return now + timeout if reply&.prompt_blocked?
|
return now + timeout if reply&.prompt_blocked?
|
||||||
|
|
||||||
|
check_deadline(now, deadline, timeout)
|
||||||
|
end
|
||||||
|
|
||||||
|
def check_deadline(now, deadline, timeout)
|
||||||
raise TimeoutError, "SSE stream timed out after #{timeout}s" if now > deadline
|
raise TimeoutError, "SSE stream timed out after #{timeout}s" if now > deadline
|
||||||
|
|
||||||
deadline
|
deadline
|
||||||
@@ -628,7 +634,7 @@ module Opencode
|
|||||||
add_auth_header(request)
|
add_auth_header(request)
|
||||||
|
|
||||||
response = nil
|
response = nil
|
||||||
result = Opencode::Instrumentation.instrument("opencode.request", method: request.method, path: request.path) do
|
result = Opencode::Instrumentation.instrument("opencode.request", method: request.method, path: request.uri.path) do
|
||||||
response = http_client.request(request)
|
response = http_client.request(request)
|
||||||
handle_response(response)
|
handle_response(response)
|
||||||
end
|
end
|
||||||
@@ -680,23 +686,30 @@ module Opencode
|
|||||||
end
|
end
|
||||||
|
|
||||||
def handle_response(response)
|
def handle_response(response)
|
||||||
return {} if response.code.to_i == 204
|
status = response.code.to_i
|
||||||
|
return {} if status == 204
|
||||||
|
|
||||||
body = if response.body.present?
|
body = parse_response_body(response, status)
|
||||||
JSON.parse(response.body, symbolize_names: true)
|
|
||||||
else
|
|
||||||
{}
|
|
||||||
end
|
|
||||||
|
|
||||||
case response.code.to_i
|
case status
|
||||||
when 200..299 then body
|
when 200..299 then body
|
||||||
when 400 then raise BadRequestError.new(error_message(body, "Bad request"), response: body)
|
|
||||||
when 404 then raise SessionNotFoundError.new(error_message(body, "Session not found"), response: body)
|
when 404 then raise SessionNotFoundError.new(error_message(body, "Session not found"), response: body)
|
||||||
|
when 400..499 then raise BadRequestError.new(error_message(body, "Bad request"), response: body)
|
||||||
when 500..599 then raise ServerError.new(error_message(body, "Server error"), response: body)
|
when 500..599 then raise ServerError.new(error_message(body, "Server error"), response: body)
|
||||||
else raise Error.new("Unexpected response: #{response.code}", response: body)
|
else raise Error.new("Unexpected response: #{response.code}", response: body)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def parse_response_body(response, status)
|
||||||
|
return {} if response.body.blank?
|
||||||
|
|
||||||
|
JSON.parse(response.body, symbolize_names: true)
|
||||||
rescue JSON::ParserError
|
rescue JSON::ParserError
|
||||||
raise ServerError.new("Invalid JSON from OpenCode (HTTP #{response.code}): #{response.body&.truncate(200)}")
|
if status.between?(200, 299)
|
||||||
|
raise ServerError.new("Invalid JSON from OpenCode (HTTP #{response.code}): #{response.body&.truncate(200)}")
|
||||||
|
end
|
||||||
|
|
||||||
|
{ message: response.body.to_s.truncate(200) }
|
||||||
end
|
end
|
||||||
|
|
||||||
# OpenCode HTTP error bodies use a wrapped shape: { name:, data: { message:, kind?: } }.
|
# OpenCode HTTP error bodies use a wrapped shape: { name:, data: { message:, kind?: } }.
|
||||||
@@ -704,6 +717,9 @@ module Opencode
|
|||||||
# `body[:message]` is no longer populated for errors — only `body[:data][:message]`.
|
# `body[:message]` is no longer populated for errors — only `body[:data][:message]`.
|
||||||
# We read both to keep older mock servers working in tests.
|
# We read both to keep older mock servers working in tests.
|
||||||
def error_message(body, fallback)
|
def error_message(body, fallback)
|
||||||
|
return body.truncate(200) if body.is_a?(String) && body.present?
|
||||||
|
return fallback unless body.is_a?(Hash)
|
||||||
|
|
||||||
body.dig(:data, :message) || body[:message] || fallback
|
body.dig(:data, :message) || body[:message] || fallback
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module Opencode
|
module Opencode
|
||||||
VERSION = "0.0.1.alpha8"
|
VERSION = "0.0.1.alpha9"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -30,14 +30,10 @@ Gem::Specification.new do |spec|
|
|||||||
%w[README.md LICENSE CHANGELOG.md opencode-ruby.gemspec]
|
%w[README.md LICENSE CHANGELOG.md opencode-ruby.gemspec]
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
# The only runtime dependency is ActiveSupport (NOT Rails). ActiveSupport
|
# ActiveSupport supplies the small set of core extensions used by the
|
||||||
# is a standalone gem providing the `present?`/`blank?`/`presence`/
|
# client without pulling in Rails. Marcel identifies artifact content types.
|
||||||
# `truncate`/`duplicable?` helpers used in this gem's code. It does NOT
|
|
||||||
# pull in ActiveRecord, ActionView, ActionController, Turbo, or any other
|
|
||||||
# Rails-only piece. Most Ruby apps in the wild already have ActiveSupport
|
|
||||||
# transitively via another gem; in the rare case yours doesn't, ~250 LOC
|
|
||||||
# of core_ext is added when this gem installs.
|
|
||||||
spec.add_runtime_dependency "activesupport", ">= 6.1", "< 9.0"
|
spec.add_runtime_dependency "activesupport", ">= 6.1", "< 9.0"
|
||||||
|
spec.add_runtime_dependency "marcel", "~> 1.0"
|
||||||
|
|
||||||
spec.add_development_dependency "minitest", "~> 5.20"
|
spec.add_development_dependency "minitest", "~> 5.20"
|
||||||
spec.add_development_dependency "rake", "~> 13.0"
|
spec.add_development_dependency "rake", "~> 13.0"
|
||||||
|
|||||||
22
test/conversation_recipe_test.rb
Normal file
22
test/conversation_recipe_test.rb
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "test_helper"
|
||||||
|
|
||||||
|
class ConversationRecipeTest < Minitest::Test
|
||||||
|
RECIPE = File.read(File.expand_path("../examples/conversation_recipe.rb", __dir__))
|
||||||
|
|
||||||
|
def test_recovery_retries_with_the_recreated_session
|
||||||
|
assert_includes RECIPE,
|
||||||
|
"session_id = message.conversation.recreate_opencode_session!(client)"
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_user_facing_error_does_not_include_exception_details
|
||||||
|
assert_includes RECIPE, 'content: "An error occurred. Please try again."'
|
||||||
|
refute_includes RECIPE, 'content: "An error occurred: #{e.message.truncate(200)}"'
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_error_reporting_works_on_the_supported_rails_6_1_baseline
|
||||||
|
assert_includes RECIPE, "Rails.logger.error(e.full_message)"
|
||||||
|
refute_includes RECIPE, "Rails.error.report"
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
require "timeout"
|
||||||
|
|
||||||
# End-to-end smoke test of the gem's public surface. Validates that the
|
# End-to-end smoke test of the gem's public surface. Validates that the
|
||||||
# headline `client.stream(...)` API + Reply::Result + error model + the
|
# headline `client.stream(...)` API + Reply::Result + error model + the
|
||||||
@@ -499,6 +500,70 @@ class SmokeTest < Minitest::Test
|
|||||||
assert_equal [ true, false, true, false, false ], wait_states
|
assert_equal [ true, false, true, false, false ], wait_states
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_prompt_wait_does_not_suspend_timeout_after_disconnect
|
||||||
|
question = {
|
||||||
|
type: "question.asked",
|
||||||
|
properties: { id: "que_1", sessionID: SESSION_ID, questions: [] }
|
||||||
|
}
|
||||||
|
stub_request(:get, %r{#{Regexp.escape(BASE)}/event(\?.*)?\z})
|
||||||
|
.to_return(
|
||||||
|
status: 200,
|
||||||
|
body: "data: #{question.to_json}\n\n",
|
||||||
|
headers: { "Content-Type" => "text/event-stream" }
|
||||||
|
).then.to_raise(Errno::ECONNREFUSED)
|
||||||
|
|
||||||
|
reply = Opencode::Reply.new
|
||||||
|
assert_raises(Opencode::TimeoutError) do
|
||||||
|
Timeout.timeout(0.5) do
|
||||||
|
@client.stream_events(
|
||||||
|
session_id: SESSION_ID,
|
||||||
|
timeout: 0.01,
|
||||||
|
first_event_timeout: 1,
|
||||||
|
reply: reply
|
||||||
|
) { |event| reply.apply(event) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_connected_prompt_wait_suspends_timeout_while_events_keep_arriving
|
||||||
|
question = {
|
||||||
|
type: "question.asked",
|
||||||
|
properties: { id: "que_1", sessionID: SESSION_ID, questions: [] }
|
||||||
|
}
|
||||||
|
replied = {
|
||||||
|
type: "question.replied",
|
||||||
|
properties: { requestID: "que_1", sessionID: SESSION_ID, answers: [ [ "yes" ] ] }
|
||||||
|
}
|
||||||
|
idle = {
|
||||||
|
type: "session.status",
|
||||||
|
properties: { sessionID: SESSION_ID, status: { type: "idle" } }
|
||||||
|
}
|
||||||
|
|
||||||
|
response = Net::HTTPOK.new("1.1", "200", "OK")
|
||||||
|
response.define_singleton_method(:read_body) do |&callback|
|
||||||
|
callback.call("data: #{question.to_json}\n\n")
|
||||||
|
sleep 0.02
|
||||||
|
callback.call("data: #{replied.to_json}\n\n")
|
||||||
|
callback.call("data: #{idle.to_json}\n\n")
|
||||||
|
end
|
||||||
|
http = Object.new
|
||||||
|
http.define_singleton_method(:use_ssl=) { |_value| }
|
||||||
|
http.define_singleton_method(:open_timeout=) { |_value| }
|
||||||
|
http.define_singleton_method(:read_timeout=) { |_value| }
|
||||||
|
http.define_singleton_method(:request) { |_request, &callback| callback.call(response) }
|
||||||
|
http.define_singleton_method(:started?) { false }
|
||||||
|
|
||||||
|
reply = Opencode::Reply.new
|
||||||
|
Net::HTTP.stub(:new, ->(_host, _port) { http }) do
|
||||||
|
@client.stream_events(
|
||||||
|
session_id: SESSION_ID,
|
||||||
|
timeout: 0.01,
|
||||||
|
first_event_timeout: 1,
|
||||||
|
reply: reply
|
||||||
|
) { |event| reply.apply(event) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def test_stream_block_is_optional
|
def test_stream_block_is_optional
|
||||||
stub_request(:post, "#{BASE}/session/#{SESSION_ID}/prompt_async")
|
stub_request(:post, "#{BASE}/session/#{SESSION_ID}/prompt_async")
|
||||||
.to_return(status: 204, body: "")
|
.to_return(status: 204, body: "")
|
||||||
@@ -543,7 +608,13 @@ class SmokeTest < Minitest::Test
|
|||||||
}
|
}
|
||||||
sse = [
|
sse = [
|
||||||
CONNECTED_EVENT,
|
CONNECTED_EVENT,
|
||||||
{ type: "todo.updated", properties: { sessionID: SESSION_ID, todos: [] } },
|
{
|
||||||
|
type: "todo.updated",
|
||||||
|
properties: {
|
||||||
|
sessionID: SESSION_ID,
|
||||||
|
todos: [ { content: "Plan", status: "in-progress", priority: "high" } ]
|
||||||
|
}
|
||||||
|
},
|
||||||
{ type: "message.part.updated", properties: { sessionID: SESSION_ID, part: skill_part } },
|
{ type: "message.part.updated", properties: { sessionID: SESSION_ID, part: skill_part } },
|
||||||
{ type: "message.part.updated", properties: { sessionID: SESSION_ID, part: task_part } },
|
{ type: "message.part.updated", properties: { sessionID: SESSION_ID, part: task_part } },
|
||||||
{ type: "message.part.delta",
|
{ type: "message.part.delta",
|
||||||
@@ -573,9 +644,33 @@ class SmokeTest < Minitest::Test
|
|||||||
|
|
||||||
assert_equal "SUBAGENT_OK", reply.full_text
|
assert_equal "SUBAGENT_OK", reply.full_text
|
||||||
assert_equal %w[todowrite skill task], reply.tool_parts.map { |part| part.fetch("tool") }
|
assert_equal %w[todowrite skill task], reply.tool_parts.map { |part| part.fetch("tool") }
|
||||||
|
assert_equal(
|
||||||
|
[ { "content" => "Plan", "status" => "in_progress", "priority" => "high" } ],
|
||||||
|
reply.tool_parts.first.dig("input", "todos")
|
||||||
|
)
|
||||||
assert_equal "ses_child", reply.tool_parts.last.dig("metadata", "sessionId")
|
assert_equal "ses_child", reply.tool_parts.last.dig("metadata", "sessionId")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_write_artifacts_work_in_a_standalone_client
|
||||||
|
response = {
|
||||||
|
parts: [
|
||||||
|
{
|
||||||
|
type: "tool",
|
||||||
|
tool: "write",
|
||||||
|
state: {
|
||||||
|
status: "completed",
|
||||||
|
input: { filePath: "/tmp/report.md", content: "# Report" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_equal(
|
||||||
|
[ { filename: "report.md", content: "# Report", content_type: "text/markdown" } ],
|
||||||
|
Opencode::ResponseParser.extract_artifact_files(response)
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
def test_connection_refused_raises_ConnectionError
|
def test_connection_refused_raises_ConnectionError
|
||||||
stub_request(:get, "http://opencode.dead/global/health")
|
stub_request(:get, "http://opencode.dead/global/health")
|
||||||
.to_raise(Errno::ECONNREFUSED)
|
.to_raise(Errno::ECONNREFUSED)
|
||||||
@@ -594,6 +689,85 @@ class SmokeTest < Minitest::Test
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_plain_text_404_preserves_SessionNotFoundError
|
||||||
|
stub_request(:get, "#{BASE}/session/missing/message")
|
||||||
|
.to_return(status: 404, body: "not found", headers: { "Content-Type" => "text/plain" })
|
||||||
|
|
||||||
|
assert_raises(Opencode::SessionNotFoundError) do
|
||||||
|
@client.get_messages("missing")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_non_404_client_errors_raise_BadRequestError
|
||||||
|
stub_request(:get, "#{BASE}/session")
|
||||||
|
.to_return(status: 401, body: { error: "unauthorized" }.to_json,
|
||||||
|
headers: { "Content-Type" => "application/json" })
|
||||||
|
|
||||||
|
assert_raises(Opencode::BadRequestError) { @client.list_sessions }
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_plain_text_client_errors_raise_BadRequestError
|
||||||
|
stub_request(:get, "#{BASE}/session")
|
||||||
|
.to_return(status: 401, body: "unauthorized", headers: { "Content-Type" => "text/plain" })
|
||||||
|
|
||||||
|
assert_raises(Opencode::BadRequestError) { @client.list_sessions }
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_non_object_json_client_errors_raise_BadRequestError
|
||||||
|
[ '"unauthorized"', "[]", "null" ].each do |body|
|
||||||
|
stub_request(:get, "#{BASE}/session")
|
||||||
|
.to_return(status: 401, body: body, headers: { "Content-Type" => "application/json" })
|
||||||
|
|
||||||
|
assert_raises(Opencode::BadRequestError) { @client.list_sessions }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_list_questions_uses_the_public_error_hierarchy
|
||||||
|
stub_request(:get, "#{BASE}/question")
|
||||||
|
.to_return(status: 401, body: { error: "unauthorized" }.to_json,
|
||||||
|
headers: { "Content-Type" => "application/json" })
|
||||||
|
|
||||||
|
assert_raises(Opencode::BadRequestError) { @client.list_questions }
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_stream_retries_socket_errors_until_its_timeout
|
||||||
|
stub_request(:get, %r{#{Regexp.escape(BASE)}/event(\?.*)?\z})
|
||||||
|
.to_raise(SocketError.new("name resolution failed"))
|
||||||
|
|
||||||
|
assert_raises(Opencode::StaleSessionError) do
|
||||||
|
@client.stream_events(
|
||||||
|
session_id: SESSION_ID,
|
||||||
|
timeout: 1,
|
||||||
|
first_event_timeout: 0.01
|
||||||
|
) { }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_stream_does_not_swallow_socket_errors_from_the_caller_block
|
||||||
|
event = {
|
||||||
|
type: "message.part.updated",
|
||||||
|
properties: {
|
||||||
|
sessionID: SESSION_ID,
|
||||||
|
part: { id: "part_1", type: "text", text: "hello" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stub_request(:get, %r{#{Regexp.escape(BASE)}/event(\?.*)?\z})
|
||||||
|
.to_return(
|
||||||
|
status: 200,
|
||||||
|
body: "data: #{event.to_json}\n\n",
|
||||||
|
headers: { "Content-Type" => "text/event-stream" }
|
||||||
|
)
|
||||||
|
|
||||||
|
error = assert_raises(SocketError) do
|
||||||
|
Timeout.timeout(0.5) do
|
||||||
|
@client.stream_events(session_id: SESSION_ID, timeout: 1, first_event_timeout: 1) do
|
||||||
|
raise SocketError, "caller lookup failed"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
assert_equal "caller lookup failed", error.message
|
||||||
|
end
|
||||||
|
|
||||||
def test_instrumentation_adapter_receives_request_events
|
def test_instrumentation_adapter_receives_request_events
|
||||||
events = []
|
events = []
|
||||||
Opencode::Instrumentation.adapter = ->(name, payload, &block) {
|
Opencode::Instrumentation.adapter = ->(name, payload, &block) {
|
||||||
@@ -610,6 +784,47 @@ class SmokeTest < Minitest::Test
|
|||||||
"instrumentation adapter must receive opencode.request events"
|
"instrumentation adapter must receive opencode.request events"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_instrumentation_does_not_expose_scoped_query_values
|
||||||
|
events = []
|
||||||
|
Opencode::Instrumentation.adapter = ->(name, payload, &block) {
|
||||||
|
events << [ name, payload ]
|
||||||
|
block.call
|
||||||
|
}
|
||||||
|
client = Opencode::Client.new(
|
||||||
|
base_url: "#{BASE}?token=base-secret",
|
||||||
|
directory: "/private/workspace",
|
||||||
|
workspace: "workspace-secret"
|
||||||
|
)
|
||||||
|
stub_request(:get, %r{#{Regexp.escape(BASE)}/session\?.*})
|
||||||
|
.to_return(status: 200, body: "[]",
|
||||||
|
headers: { "Content-Type" => "application/json" })
|
||||||
|
|
||||||
|
client.list_sessions
|
||||||
|
|
||||||
|
payload = events.find { |name, _| name == "opencode.request" }.last
|
||||||
|
assert_equal "/session", payload.fetch(:path)
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_list_questions_instrumentation_does_not_expose_scoped_query_values
|
||||||
|
events = []
|
||||||
|
Opencode::Instrumentation.adapter = ->(name, payload, &block) {
|
||||||
|
events << [ name, payload ]
|
||||||
|
block.call
|
||||||
|
}
|
||||||
|
client = Opencode::Client.new(
|
||||||
|
base_url: "#{BASE}?token=base-secret",
|
||||||
|
directory: "/private/workspace",
|
||||||
|
workspace: "workspace-secret"
|
||||||
|
)
|
||||||
|
stub_request(:get, %r{#{Regexp.escape(BASE)}/question\?.*})
|
||||||
|
.to_return(status: 200, body: "[]", headers: { "Content-Type" => "application/json" })
|
||||||
|
|
||||||
|
client.list_questions
|
||||||
|
|
||||||
|
payload = events.find { |name, _| name == "opencode.request" }.last
|
||||||
|
assert_equal "/question", payload.fetch(:path)
|
||||||
|
end
|
||||||
|
|
||||||
def test_Reply_distill_returns_typed_Result
|
def test_Reply_distill_returns_typed_Result
|
||||||
parts = [
|
parts = [
|
||||||
{ "type" => "text", "content" => "hi" },
|
{ "type" => "text", "content" => "hi" },
|
||||||
|
|||||||
@@ -13,7 +13,14 @@ class ReadmeContractTest < Minitest::Test
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_release_guidance_does_not_claim_trusted_publishing_is_configured
|
def test_release_guidance_does_not_claim_trusted_publishing_is_configured
|
||||||
assert_includes README, "not configured as of `0.0.1.alpha7`"
|
assert_includes README, "`0.0.1.alpha8` package contained unrepaired source"
|
||||||
|
assert_includes README, "was yanked"
|
||||||
|
assert_includes README, "registration is not confirmed for alpha9"
|
||||||
assert_includes README, "does not currently guarantee publication"
|
assert_includes README, "does not currently guarantee publication"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_compatibility_documents_every_runtime_dependency
|
||||||
|
assert_includes README, "`activesupport (>= 6.1, < 9.0)`"
|
||||||
|
assert_includes README, "`marcel (~> 1.0)`"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ class ReleaseWorkflowTest < Minitest::Test
|
|||||||
workflow.fetch("jobs").fetch("push")
|
workflow.fetch("jobs").fetch("push")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def verify_job
|
||||||
|
workflow.fetch("jobs").fetch("verify")
|
||||||
|
end
|
||||||
|
|
||||||
def test_release_job_is_inert_on_non_github_runners
|
def test_release_job_is_inert_on_non_github_runners
|
||||||
assert_equal "${{ github.server_url == 'https://github.com' }}", push_job.fetch("if")
|
assert_equal "${{ github.server_url == 'https://github.com' }}", push_job.fetch("if")
|
||||||
end
|
end
|
||||||
@@ -32,22 +36,39 @@ class ReleaseWorkflowTest < Minitest::Test
|
|||||||
setup_ruby = steps.find { |step| step["uses"] == SETUP_RUBY_ACTION }
|
setup_ruby = steps.find { |step| step["uses"] == SETUP_RUBY_ACTION }
|
||||||
|
|
||||||
assert_equal "4.0", setup_ruby.dig("with", "ruby-version")
|
assert_equal "4.0", setup_ruby.dig("with", "ruby-version")
|
||||||
|
assert_equal true, setup_ruby.dig("with", "bundler-cache")
|
||||||
assert_equal 1, steps.count { |step| step["uses"] == RELEASE_GEM_ACTION }
|
assert_equal 1, steps.count { |step| step["uses"] == RELEASE_GEM_ACTION }
|
||||||
assert steps.filter_map { |step| step["uses"] }.all? { |uses| uses.match?(/@[0-9a-f]{40}\z/) }
|
assert steps.filter_map { |step| step["uses"] }.all? { |uses| uses.match?(/@[0-9a-f]{40}\z/) }
|
||||||
refute steps.any? { |step| step.fetch("run", "").match?(/\bgem\s+push\b/) }
|
refute steps.any? { |step| step.key?("run") }
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_release_tag_must_match_the_gem_version_before_publish
|
def test_release_tag_must_match_the_gem_version_before_publish
|
||||||
steps = push_job.fetch("steps")
|
preflight = verify_job.fetch("steps").find { |step| step["name"] == "Verify tag matches gem version" }
|
||||||
preflight_index = steps.index { |step| step["name"] == "Verify tag matches gem version" }
|
|
||||||
publish_index = steps.index { |step| step["uses"] == RELEASE_GEM_ACTION }
|
|
||||||
|
|
||||||
refute_nil preflight_index
|
refute_nil preflight
|
||||||
refute_nil publish_index
|
|
||||||
assert_operator preflight_index, :<, publish_index
|
|
||||||
|
|
||||||
preflight = steps.fetch(preflight_index)
|
|
||||||
assert_equal "${{ github.ref_name }}", preflight.dig("env", "RELEASE_TAG")
|
assert_equal "${{ github.ref_name }}", preflight.dig("env", "RELEASE_TAG")
|
||||||
assert_includes preflight.fetch("run"), "unless Opencode::VERSION == expected"
|
assert_includes preflight.fetch("run"), "unless Opencode::VERSION == expected"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_verification_job_has_read_only_credentials
|
||||||
|
assert_equal({ "contents" => "read" }, verify_job.fetch("permissions"))
|
||||||
|
|
||||||
|
checkout = verify_job.fetch("steps").find { |step| step.fetch("uses", "").start_with?("actions/checkout@") }
|
||||||
|
assert_equal false, checkout.dig("with", "persist-credentials")
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_release_verifies_the_supported_matrix_and_installed_gem_before_publish
|
||||||
|
assert_equal %w[3.2 3.3 3.4 4.0], verify_job.dig("strategy", "matrix", "ruby")
|
||||||
|
assert_equal "verify", push_job.fetch("needs")
|
||||||
|
|
||||||
|
commands = verify_job.fetch("steps").filter_map { |step| step["run"] }.join("\n")
|
||||||
|
assert_includes commands, "bundle exec rake test"
|
||||||
|
assert_includes commands, "gem build opencode-ruby.gemspec"
|
||||||
|
assert_includes commands, "bundle exec ruby -e"
|
||||||
|
assert_includes commands, 'GEM_HOME="${RUNNER_TEMP}/opencode-ruby-${{ matrix.ruby }}"'
|
||||||
|
assert_includes commands, 'gem_file="opencode-ruby-$(ruby -Ilib -ropencode/version'
|
||||||
|
assert_includes commands, 'gem install --local "$gem_file" --no-document'
|
||||||
|
assert_includes commands, "Gem.loaded_specs.fetch(\"opencode-ruby\").full_gem_path"
|
||||||
|
assert_includes commands, "ruby -ropencode-ruby"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class WorkflowContractTest < Minitest::Test
|
|||||||
workflow_uses(workflow)
|
workflow_uses(workflow)
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_equal 5, action_uses.length
|
assert_equal 7, action_uses.length
|
||||||
action_uses.each do |action_use|
|
action_uses.each do |action_use|
|
||||||
action, separator, revision = action_use.rpartition("@")
|
action, separator, revision = action_use.rpartition("@")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user