ocak 0.3.0 → 0.5.0

data/lib/ocak/templates/ocak.yml.erb

@@ -12,6 +12,7 @@ stack:
 <%- end -%>
 <%- if lint_command -%>
   lint_command: "<%= lint_command %>"
+  # lint_check_command: "<%= lint_command %>"  # Explicit check-only lint command (no auto-fix flags)
 <%- end -%>
 <%- if setup_command -%>
   setup_command: "<%= setup_command %>"
@@ -26,6 +27,12 @@ stack:
 <%- end -%>
 <%- end -%>
 
+# Issue backend — 'github' (default) or 'local'
+# Local mode stores issues as files in .ocak/issues/ (no gh CLI needed for issues).
+# Auto-detected: if .ocak/issues/ contains .md files, local mode is used automatically.
+# issues:
+#   backend: local
+
 # Pipeline settings
 pipeline:
   max_parallel: 5
@@ -56,29 +63,38 @@ labels:
 steps:
   - agent: implementer
     role: implement
+    model: sonnet
   - agent: reviewer
     role: review
+    model: opus
   - agent: implementer
     role: fix
     condition: has_findings
+    model: sonnet
   - agent: reviewer
     role: verify
     condition: had_fixes
+    model: opus
   - agent: security_reviewer
     role: security
+    model: sonnet
     complexity: full          # skipped for simple issues and --fast mode
   - agent: implementer
     role: fix
     condition: has_findings
     complexity: full          # skipped for simple issues
+    model: sonnet
   - agent: documenter
     role: document
     complexity: full          # skipped for simple issues
+    model: sonnet
   - agent: auditor
     role: audit
     complexity: full          # skipped for simple issues
+    model: sonnet
   - agent: merger
     role: merge
+    model: sonnet
 
 # Agent file paths — override to use custom agents
 agents:

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?
@@ -23,7 +52,12 @@ module Ocak
     end
 
     def run_scoped_lint(logger, chdir:)
-      changed_stdout, = Open3.capture3('git', 'diff', '--name-only', 'main', chdir: chdir)
+      changed_stdout, stderr, status = Open3.capture3('git', 'diff', '--name-only', 'main', chdir: chdir)
+      unless status.success?
+        logger&.warn("Scoped lint skipped — git diff failed: #{stderr[0..200]}")
+        return nil
+      end
+
       changed_files = changed_stdout.lines.map(&:strip).reject(&:empty?)
 
       extensions = lint_extensions_for(@config.language)
@@ -42,6 +76,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 +97,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 +105,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,14 +7,17 @@ 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
 
     def create(issue_number, setup_command: nil)
       @mutex.synchronize do
+        raise ArgumentError, "Invalid issue number: #{issue_number}" unless issue_number.to_s.match?(/\A\d+\z/)
+
         FileUtils.mkdir_p(@worktree_base)
 
         branch = "auto/issue-#{issue_number}-#{SecureRandom.hex(4)}"
@@ -56,7 +59,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 +68,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.5.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.5.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.
@@ -50,34 +36,51 @@ files:
 - bin/ocak
 - lib/ocak.rb
 - lib/ocak/agent_generator.rb
+- lib/ocak/batch_processing.rb
 - lib/ocak/claude_runner.rb
 - lib/ocak/cli.rb
+- lib/ocak/command_runner.rb
 - lib/ocak/commands/audit.rb
 - lib/ocak/commands/clean.rb
 - lib/ocak/commands/debt.rb
 - lib/ocak/commands/design.rb
 - lib/ocak/commands/hiz.rb
 - lib/ocak/commands/init.rb
+- lib/ocak/commands/issue/close.rb
+- lib/ocak/commands/issue/create.rb
+- lib/ocak/commands/issue/edit.rb
+- lib/ocak/commands/issue/list.rb
+- lib/ocak/commands/issue/view.rb
 - lib/ocak/commands/resume.rb
 - 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/instance_builders.rb
+- lib/ocak/issue_backend.rb
 - lib/ocak/issue_fetcher.rb
+- lib/ocak/local_issue_fetcher.rb
+- lib/ocak/local_merge_manager.rb
 - lib/ocak/logger.rb
 - lib/ocak/merge_manager.rb
 - lib/ocak/merge_orchestration.rb
 - lib/ocak/monorepo_detector.rb
+- lib/ocak/parallel_execution.rb
 - lib/ocak/pipeline_executor.rb
 - lib/ocak/pipeline_runner.rb
 - lib/ocak/pipeline_state.rb
 - lib/ocak/planner.rb
 - lib/ocak/process_registry.rb
 - lib/ocak/process_runner.rb
+- lib/ocak/project_key.rb
 - lib/ocak/reready_processor.rb
 - lib/ocak/run_report.rb
+- lib/ocak/shutdown_handling.rb
 - lib/ocak/stack_detector.rb
+- lib/ocak/state_management.rb
 - lib/ocak/step_comments.rb
+- lib/ocak/step_execution.rb
 - lib/ocak/stream_parser.rb
 - lib/ocak/templates/agents/auditor.md.erb
 - lib/ocak/templates/agents/documenter.md.erb