ocak 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e35193d8d3fc3b9c24f7e75502749ce4f9a57352da20d9bb0c980c2191ad9a
-  data.tar.gz: 2204cd3797a57348f3a3742fa17385375050d8b66fe37d4bdb466a4f603f31dd
+  metadata.gz: 7363b1ed65b047ead5c507fdc210dea94400edca689dff88200b6cbb2a666a5d
+  data.tar.gz: 39d9e7021f666cccc84643c7d66c00db9080adaab63d9163069ca963a030963c
 SHA512:
-  metadata.gz: 7fddde997f1ba1c8f5e5e9db9e3f6dc9281ac1db82743b651f72f658967fcefeca67b05c5e338dbbaad9be798adae10f24807d1fec3ddd9975e72daba853f709
-  data.tar.gz: 0d5f6f2f9e7300eb8b242e654296dd156192e4993976a40d0ebb050a1bf417e9b36e85f1b6b4f4e8e99cc1e375275be5175f6ef9489056c2dcc1d3025cffaa9e
+  metadata.gz: 53330c5ca283948f69a63aecc4c4b14866dd6c6fc9f8c2b5f46a2fb9f73572b92c81ff43df6c2c2fdd05ecc35135d5cd236bab8cd156527477e7da55995d12c7
+  data.tar.gz: dd9f956429a2b37f1aa6dec984795bdd752d28f80ea282bbc2709377e5777f11cad181dc9c64b97505037a544e053510b070f744860b1287788da5d6ebe88693

data/lib/ocak/instance_builders.rb

@@ -22,7 +22,7 @@ module Ocak
     end
 
     def build_merge_manager(logger:, issues:)
-      if issues.is_a?(LocalIssueFetcher) && !gh_available?
+      if issues.is_a?(LocalIssueFetcher) && !@config.multi_repo? && !gh_available?
         LocalMergeManager.new(config: @config, logger: logger, issues: issues)
       else
         MergeManager.new(config: @config, claude: build_claude(logger), logger: logger,

data/lib/ocak/merge_manager.rb

@@ -73,12 +73,15 @@ module Ocak
     private
 
     def merger_prompt(issue_number, worktree)
-      if worktree.target_repo
-        "Create a PR and merge it for issue ##{issue_number}. Branch: #{worktree.branch}. " \
-          'Do NOT close any issues (the issue lives in a different repository).'
-      else
-        "Create a PR, merge it, and close issue ##{issue_number}. Branch: #{worktree.branch}"
-      end
+      base = if worktree.target_repo
+               "Create a PR and merge it for issue ##{issue_number}. Branch: #{worktree.branch}. " \
+                 'Do NOT close any issues (the issue lives in a different repository).'
+             else
+               "Create a PR, merge it, and close issue ##{issue_number}. Branch: #{worktree.branch}"
+             end
+      issue_data = @issues.view(issue_number)
+      base += "\n\n<issue_data>\nTitle: #{issue_data['title']}\n\n#{issue_data['body']}\n</issue_data>" if issue_data
+      base
     end
 
     def log_and_nil(message)

data/lib/ocak/merge_orchestration.rb

@@ -38,6 +38,7 @@ module Ocak
                    else
                      "Create a PR, merge it, and close issue ##{issue_number}"
                    end
+          prompt += merger_issue_context(issue_number, issues)
           claude.run_agent('merger', prompt, chdir: target_dir)
         end
         @state_machine.mark_completed(issue_number)
@@ -45,10 +46,10 @@ module Ocak
       end
     end
 
-    def handle_single_manual_review(issue_number, logger:, claude:, issues: nil, chdir: @config.project_dir) # rubocop:disable Lint/UnusedMethodArgument
-      claude.run_agent('merger',
-                       "Create a PR for issue ##{issue_number} but do NOT merge it and do NOT close the issue",
-                       chdir: chdir)
+    def handle_single_manual_review(issue_number, logger:, claude:, issues: nil, chdir: @config.project_dir)
+      prompt = "Create a PR for issue ##{issue_number} but do NOT merge it and do NOT close the issue"
+      prompt += merger_issue_context(issue_number, issues)
+      claude.run_agent('merger', prompt, chdir: chdir)
       @state_machine.mark_for_review(issue_number)
       logger.info("Issue ##{issue_number} PR created (manual review mode)")
     end
@@ -96,6 +97,13 @@ module Ocak
       logger.info("Posted audit comment on PR ##{pr_number}")
     end
 
+    def merger_issue_context(issue_number, issues)
+      issue_data = issues&.view(issue_number)
+      return '' unless issue_data
+
+      "\n\n<issue_data>\nTitle: #{issue_data['title']}\n\n#{issue_data['body']}\n</issue_data>"
+    end
+
     def pipeline_has_merge_step?
       @config.steps.any? { |s| s[:role].to_s == 'merge' || s['role'].to_s == 'merge' }
     end

data/lib/ocak/pipeline_executor.rb

@@ -44,6 +44,7 @@ module Ocak
 
       report = RunReport.new(complexity: complexity)
       state = build_initial_state(complexity, report)
+      state[:issue_data] = @issues&.view(issue_number)
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       post_pipeline_start_comment(issue_number, state) if post_start_comment
 

data/lib/ocak/planner.rb

@@ -14,14 +14,27 @@ module Ocak
       'merge' => 'Create a PR, merge it, and close issue #%<issue>s'
     }.freeze
 
-    def build_step_prompt(role, issue_number, review_output)
-      if role == 'fix'
-        "Fix these review findings for issue ##{issue_number}:\n\n<review_output>\n#{review_output}\n</review_output>"
-      elsif STEP_PROMPTS.key?(role)
-        format(STEP_PROMPTS[role], issue: issue_number)
-      else
-        "Run #{role} for GitHub issue ##{issue_number}"
-      end
+    ISSUE_CONTEXT_ROLES = %w[implement document merge].freeze
+
+    def build_step_prompt(role, issue_number, review_output, issue_data: nil)
+      prompt = if role == 'fix'
+                 "Fix these review findings for issue ##{issue_number}:\n\n" \
+                   "<review_output>\n#{review_output}\n</review_output>"
+               elsif STEP_PROMPTS.key?(role)
+                 format(STEP_PROMPTS[role], issue: issue_number)
+               else
+                 "Run #{role} for GitHub issue ##{issue_number}"
+               end
+
+      prompt += format_issue_context(issue_data) if issue_data && ISSUE_CONTEXT_ROLES.include?(role)
+      prompt
+    end
+
+    def format_issue_context(issue_data)
+      parts = []
+      parts << "Title: #{issue_data['title']}" if issue_data['title']
+      parts << issue_data['body'] if issue_data['body']
+      "\n\n<issue_data>\n#{parts.join("\n\n")}\n</issue_data>"
     end
 
     def plan_batches(issues, logger:, claude:)

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/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

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

@@ -39,10 +39,9 @@ If anything fails after conflict resolution, STOP and report the failures. Do no
 
 ### 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

data/lib/ocak.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ocak
-  VERSION = '0.6.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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Clay Harmon