ocak 0.5.0 → 0.6.1

data/lib/ocak/step_execution.rb

@@ -18,7 +18,8 @@ module Ocak
       end
 
       result = execute_step(step, issue_number, state[:last_review_output], logger: logger, claude: claude,
-                                                                            chdir: chdir)
+                                                                            chdir: chdir,
+                                                                            issue_data: state[:issue_data])
       state[:report].record_step(index: idx, agent: agent, role: role, status: 'completed', result: result)
       ctx = StateManagement::StepContext.new(issue_number, idx, role, result, state, logger, chdir)
       record_step_result(ctx, mutex: mutex)
@@ -37,12 +38,12 @@ module Ocak
       state[:steps_skipped] += 1
     end
 
-    def execute_step(step, issue_number, review_output, logger:, claude:, chdir:)
+    def execute_step(step, issue_number, review_output, logger:, claude:, chdir:, issue_data: nil) # rubocop:disable Metrics/ParameterLists
       agent = step[:agent].to_s
       role = step[:role].to_s
       logger.info("--- Phase: #{role} (#{agent}) ---")
       post_step_comment(issue_number, "🔄 **Phase: #{role}** (#{agent})")
-      prompt = build_step_prompt(role, issue_number, review_output)
+      prompt = build_step_prompt(role, issue_number, review_output, issue_data: issue_data)
       opts = { chdir: chdir }
       opts[:model] = step[:model].to_s if step[:model]
       claude.run_agent(agent.tr('_', '-'), prompt, **opts)
@@ -51,9 +52,8 @@ module Ocak
     def skip_reason(step, state)
       condition = step[:condition]
 
-      return 'merge handled by MergeManager' if step[:role].to_s == 'merge' && @skip_merge
-      return 'audit found blocking issues' if step[:role].to_s == 'merge' && @config.audit_mode && state[:audit_blocked]
-      return 'manual review mode' if step[:role].to_s == 'merge' && @config.manual_review
+      return merge_skip_reason(state) if step[:role].to_s == 'merge'
+      return 'audit mode not enabled' if step[:role].to_s == 'audit' && !@config.audit_mode
       return 'fast-track issue (simple complexity)' if step[:complexity] == 'full' && state[:complexity] == 'simple'
       if condition == 'has_findings' && !state[:last_review_output]&.include?('🔴')
         return 'no blocking findings from review'
@@ -62,5 +62,13 @@ module Ocak
 
       nil
     end
+
+    def merge_skip_reason(state)
+      return 'merge handled by MergeManager' if @skip_merge
+      return 'audit found blocking issues' if @config.audit_mode && state[:audit_blocked]
+      return 'manual review mode' if @config.manual_review
+
+      nil
+    end
   end
 end

data/lib/ocak/stream_parser.rb

@@ -191,7 +191,7 @@ module Ocak
     end
 
     def detect_test_pass(output)
-      return true  if output.match?(/0 failures,\s*0 errors/)
+      return true  if output.match?(/\b0 failures\b/)
       return true  if output.match?(/no offenses detected/i)
       return true  if output.match?(/test result: ok/i) # cargo test
       return false if output.match?(/[1-9]\d* failures?/) || output.match?(/[1-9]\d* errors?/)

data/lib/ocak/target_resolver.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Ocak
+  module TargetResolver
+    # Resolves the target repo for an issue.
+    # Returns { name:, path: } hash or nil (single-repo mode).
+    # Raises TargetResolutionError on missing/invalid target in multi-repo mode.
+    def self.resolve(issue, config:)
+      return nil unless config.multi_repo?
+
+      body = issue['body'].to_s
+      repo_name = extract_target_name(body, field: config.target_field)
+
+      unless repo_name
+        raise TargetResolutionError,
+              "Issue ##{issue['number']} is missing required '#{config.target_field}' field in body. " \
+              "Known repos: #{config.repos.keys.join(', ')}"
+      end
+
+      config.resolve_repo(repo_name)
+    end
+
+    # Extract target name from YAML front-matter.
+    # Returns the target name string, or nil if not found.
+    def self.extract_target_name(body, field:)
+      match = body.match(/\A---\s*\n(.*?)\n---/m)
+      return nil unless match
+
+      frontmatter = YAML.safe_load(match[1])
+      return nil unless frontmatter.is_a?(Hash)
+
+      frontmatter[field]&.to_s&.strip
+    rescue Psych::SyntaxError
+      nil
+    end
+
+    class TargetResolutionError < StandardError; end
+  end
+end

data/lib/ocak/templates/agents/implementer.md.erb

@@ -12,7 +12,7 @@ You implement GitHub issues. The issue is your single source of truth — everyt
 ## Before You Start
 
 1. Check branch state: `git log main..HEAD --oneline` and `git diff main --stat` — work may already be partially done
-2. Read the issue via `gh issue view <number> --json title,body,labels`
+2. Read the issue data provided in your task prompt (in `<issue_data>` tags) — this is your source of truth for the issue title and body
 3. Read `CLAUDE.md` for project conventions
 4. Read every file listed in the issue's "Relevant files" and "Patterns to Follow" sections
 5. When writing new code, find the closest existing example first (neighboring file in the same directory/namespace) and mirror its structure exactly
@@ -98,6 +98,9 @@ You implement GitHub issues. The issue is your single source of truth — everyt
 <%- end -%>
 <%- end -%>
 
+### Working Directory Context
+If a CLAUDE.md file exists in the current working directory, read it for project-specific conventions, patterns, and architecture. This is especially important when working in a repository you haven't seen before.
+
 ### General Rules
 
 - Do NOT add features, refactoring, or improvements beyond what the issue specifies

data/lib/ocak/templates/agents/merger.md.erb

@@ -24,16 +24,24 @@ Only re-run tests if you had to resolve merge conflicts or edit files:
 <%- if lint_command -%>
 <%= lint_command %>
 <%- end -%>
+<%- unless test_command || lint_command -%>
+# No specific test/lint commands configured. Detect from project structure:
+# - Gemfile → bundle exec rspec (or bundle exec rake test)
+# - package.json → npm test
+# - Cargo.toml → cargo test
+# - go.mod → go test ./...
+# - pyproject.toml / setup.py → pytest
+# Read the project's CLAUDE.md for additional conventions.
+<%- end -%>
 ```
 
 If anything fails after conflict resolution, STOP and report the failures. Do not create a PR with failing checks.
 
 ### 2. Create Pull Request
 
-```bash
-# Get the issue title and body for context
-gh issue view <number> --json title,body
+Use the issue data provided in your task prompt (in `<issue_data>` tags) for the issue title and body context. Do NOT run `gh issue view` — the issue may live in a different repository.
 
+```bash
 # Get full diff for PR description
 git diff main --stat
 git log main..HEAD --oneline
@@ -63,6 +71,9 @@ Closes #<issue-number>
 <%- if lint_command -%>
 - `<%= lint_command %>` — passed
 <%- end -%>
+<%- unless test_command || lint_command -%>
+- Stack auto-detected from project structure; commands detected at runtime
+<%- end -%>
 EOF
 )"
 ```

data/lib/ocak/templates/agents/pipeline.md.erb

@@ -33,6 +33,15 @@ gh issue view <number> --json title,body,labels
 <%- if test_command -%>
    - `<%= test_command %>`
 <%- end -%>
+<%- unless lint_command || test_command -%>
+   - No specific commands configured. Detect from project structure:
+     - Gemfile → bundle exec rspec (or bundle exec rake test)
+     - package.json → npm test
+     - Cargo.toml → cargo test
+     - go.mod → go test ./...
+     - pyproject.toml / setup.py → pytest
+   - Read the project's CLAUDE.md for additional conventions.
+<%- end -%>
 
 ### Phase 2: Self-Review
 
@@ -88,6 +97,15 @@ Run the complete check suite one last time:
 <%- if test_command -%>
 <%= test_command %>
 <%- end -%>
+<%- unless lint_command || test_command -%>
+# No specific commands configured. Detect from project structure:
+# - Gemfile → bundle exec rspec (or bundle exec rake test)
+# - package.json → npm test
+# - Cargo.toml → cargo test
+# - go.mod → go test ./...
+# - pyproject.toml / setup.py → pytest
+# Read the project's CLAUDE.md for additional conventions.
+<%- end -%>
 ```
 
 ALL must pass. If anything fails, fix it. Maximum 3 fix cycles — if still failing after 3 attempts, stop and report what's broken.

data/lib/ocak/templates/gitignore_additions.txt

@@ -10,3 +10,4 @@
 logs/pipeline/
 .ocak/logs/
 .ocak/reports/
+.ocak/trusted

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

@@ -1,3 +1,7 @@
+# WARNING: Commands configured in this file (test_command, lint_command, format_command,
+# setup_command, security_commands) are executed with your user privileges. Treat this
+# file like executable code — review it before running `ocak run` in an unfamiliar repo.
+
 # Ocak pipeline configuration
 # Generated by `ocak init` — customize as needed
 
@@ -27,6 +31,11 @@ stack:
 <%- end -%>
 <%- end -%>
 
+# Multi-repo mode — process issues across multiple local repos
+# Repo path mappings go in ~/.config/ocak/config.yml (machine-specific, not committed)
+# multi_repo: true
+# target_field: target_repo   # YAML front-matter field in issue body
+
 # 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.

data/lib/ocak/worktree_manager.rb

@@ -7,14 +7,15 @@ require 'shellwords'
 
 module Ocak
   class WorktreeManager
-    def initialize(config:, logger: nil)
+    def initialize(config:, repo_dir: nil, logger: nil)
       @config = config
       @logger = logger
-      @worktree_base = File.join(config.project_dir, config.worktree_dir)
+      @repo_dir = repo_dir || config.project_dir
+      @worktree_base = File.join(@repo_dir, config.worktree_dir)
       @mutex = Mutex.new
     end
 
-    def create(issue_number, setup_command: nil)
+    def create(issue_number, setup_command: nil, target_repo: nil)
       @mutex.synchronize do
         raise ArgumentError, "Invalid issue number: #{issue_number}" unless issue_number.to_s.match?(/\A\d+\z/)
 
@@ -31,7 +32,7 @@ module Ocak
           raise WorktreeError, "Setup command failed: #{stderr}" unless status.success?
         end
 
-        Worktree.new(path: path, branch: branch, issue_number: issue_number)
+        Worktree.new(path: path, branch: branch, issue_number: issue_number, target_repo: target_repo)
       end
     end
 
@@ -68,14 +69,14 @@ module Ocak
       removed
     end
 
-    Worktree = Struct.new(:path, :branch, :issue_number, keyword_init: true) # rubocop:disable Style/RedundantStructKeywordInit
+    Worktree = Struct.new(:path, :branch, :issue_number, :target_repo, keyword_init: true) # rubocop:disable Style/RedundantStructKeywordInit
 
     class WorktreeError < StandardError; end
 
     private
 
     def git(*)
-      Open3.capture3('git', *, chdir: @config.project_dir)
+      Open3.capture3('git', *, chdir: @repo_dir)
     end
 
     def parse_worktree_list(output)

data/lib/ocak.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ocak
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 
   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.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Clay Harmon
@@ -55,16 +55,19 @@ files:
 - lib/ocak/commands/run.rb
 - lib/ocak/commands/status.rb
 - lib/ocak/config.rb
+- lib/ocak/conflict_resolution.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/issue_state_machine.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/merge_verification.rb
 - lib/ocak/monorepo_detector.rb
 - lib/ocak/parallel_execution.rb
 - lib/ocak/pipeline_executor.rb
@@ -82,6 +85,7 @@ files:
 - lib/ocak/step_comments.rb
 - lib/ocak/step_execution.rb
 - lib/ocak/stream_parser.rb
+- lib/ocak/target_resolver.rb
 - lib/ocak/templates/agents/auditor.md.erb
 - lib/ocak/templates/agents/documenter.md.erb
 - lib/ocak/templates/agents/implementer.md.erb