ocak 0.5.0 → 0.6.0

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

@@ -24,6 +24,15 @@ 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.
@@ -63,6 +72,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.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.5.0
+  version: 0.6.0
 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