ocak 0.3.0 → 0.4.0

data/lib/ocak/verification.rb

@@ -6,11 +6,40 @@ require 'shellwords'
 module Ocak
   # Final verification checks (tests + lint) extracted from PipelineRunner.
   module Verification
+    def run_verification_with_retry(logger:, claude:, chdir:, model: nil, &post_comment)
+      return nil unless @config.test_command || @config.lint_check_command
+
+      logger.info('--- Final verification ---')
+      post_comment&.call("\u{1F504} **Phase: final-verify** (verification)")
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result = run_final_checks(logger, chdir: chdir)
+
+      unless result[:success]
+        logger.warn('Final checks failed, attempting fix...')
+        post_comment&.call("\u{26A0}\u{FE0F} **Final verification failed** \u2014 attempting auto-fix...")
+        fix_prompt = "Fix these test/lint failures:\n\n" \
+                     "<verification_output>\n#{result[:output]}\n</verification_output>"
+        fix_opts = { chdir: chdir }
+        fix_opts[:model] = model if model
+        claude.run_agent('implementer', fix_prompt, **fix_opts)
+        result = run_final_checks(logger, chdir: chdir)
+      end
+
+      duration = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time).round
+      if result[:success]
+        post_comment&.call("\u{2705} **Phase: final-verify** completed \u2014 #{duration}s")
+        nil
+      else
+        post_comment&.call("\u{274C} **Phase: final-verify** failed \u2014 #{duration}s")
+        { success: false, phase: 'final-verify', output: result[:output] }
+      end
+    end
+
     def run_final_checks(logger, chdir:)
       failures = []
       output_parts = []
 
-      check_tests(failures, output_parts, chdir: chdir)
+      check_tests(failures, output_parts, logger, chdir: chdir)
       check_lint(failures, output_parts, logger, chdir: chdir)
 
       if failures.empty?
@@ -42,6 +71,9 @@ module Ocak
       return nil if status.success?
 
       "=== #{@config.lint_check_command} (#{lintable.size} files) ===\n#{stdout}\n#{stderr}"
+    rescue ArgumentError => e
+      logger&.warn("Invalid shell command in config: #{@config.lint_check_command.inspect} (#{e.message})")
+      "=== #{@config.lint_check_command} ===\nArgumentError: #{e.message}"
     end
 
     def lint_extensions_for(language)
@@ -60,7 +92,7 @@ module Ocak
 
     private
 
-    def check_tests(failures, output_parts, chdir:)
+    def check_tests(failures, output_parts, logger, chdir:)
       return unless @config.test_command
 
       stdout, stderr, status = Open3.capture3(*Shellwords.shellsplit(@config.test_command), chdir: chdir)
@@ -68,6 +100,9 @@ module Ocak
 
       failures << @config.test_command
       output_parts << "=== #{@config.test_command} ===\n#{stdout}\n#{stderr}"
+    rescue ArgumentError => e
+      logger&.warn("Invalid shell command in config: #{@config.test_command.inspect} (#{e.message})")
+      failures << @config.test_command
     end
 
     def check_lint(failures, output_parts, logger, chdir:)

data/lib/ocak/worktree_manager.rb

@@ -7,8 +7,9 @@ require 'shellwords'
 
 module Ocak
   class WorktreeManager
-    def initialize(config:)
+    def initialize(config:, logger: nil)
       @config = config
+      @logger = logger
       @worktree_base = File.join(config.project_dir, config.worktree_dir)
       @mutex = Mutex.new
     end
@@ -56,7 +57,8 @@ module Ocak
         begin
           git('worktree', 'remove', '--force', wt[:path])
           removed << wt[:path]
-        rescue StandardError
+        rescue StandardError => e
+          @logger&.warn("Failed to remove worktree #{wt[:path]}: #{e.message}")
           next # skip failed removal so one bad worktree doesn't abort cleanup of others
         end
       end
@@ -64,7 +66,7 @@ module Ocak
       removed
     end
 
-    Worktree = Struct.new(:path, :branch, :issue_number)
+    Worktree = Struct.new(:path, :branch, :issue_number, keyword_init: true) # rubocop:disable Style/RedundantStructKeywordInit
 
     class WorktreeError < StandardError; end
 

data/lib/ocak.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ocak
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
   def self.root
     File.expand_path('..', __dir__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocak
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Clay Harmon
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: Ocak sets up and runs a multi-agent pipeline that autonomously implements
   GitHub issues using Claude Code. Design issues, run the pipeline, ship code. Let
   'em cook.
@@ -62,6 +48,7 @@ files:
 - lib/ocak/commands/run.rb
 - lib/ocak/commands/status.rb
 - lib/ocak/config.rb
+- lib/ocak/failure_reporting.rb
 - lib/ocak/git_utils.rb
 - lib/ocak/issue_fetcher.rb
 - lib/ocak/logger.rb