overkill 0.6.1__tar.gz → 0.8.0__tar.gz

{overkill-0.6.1 → overkill-0.8.0}/.overkillrc.example

@@ -17,6 +17,14 @@
 # Enable auto-commit of fixes (default: true)
 # AUTO_COMMIT=true
 
+# CI trigger policy for iteration commits (default: last-only)
+#   last-only — append "[skip ci]" to each iteration commit; push a single
+#               empty "chore: trigger CI" commit only when the loop ends
+#               with all_clear (saves CI cost on long iteration runs)
+#   every     — each iteration commit triggers CI (pre-0.3 behaviour)
+#   none      — append "[skip ci]"; no trigger commit (forks / CI-less repos)
+# CI_TRIGGER_MODE="last-only"
+
 # Path to active prompt templates (default: <script_dir>/../prompts/active)
 # PROMPTS_DIR="./custom-prompts"
 

{overkill-0.6.1 → overkill-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: overkill
-Version: 0.6.1
+Version: 0.8.0
 Summary: AI-powered code review loop — automates Codex/Gemini review + Claude fix cycles
 Project-URL: Repository, https://github.com/modocai/mr-overkill
 Project-URL: Issues, https://github.com/modocai/mr-overkill/issues
@@ -125,6 +125,11 @@ Options:
   --no-auto-commit         Fix but do not commit/push (single iteration)
   --resume                 Resume from a previously interrupted run (reuses existing logs)
   --reviewer-backend <be>  Reviewer backend: claude|codex (default: codex)
+  --ci-trigger-mode <m>    CI trigger policy: every|last-only|none (default: last-only).
+                           'last-only' tags each iteration commit with [skip ci]
+                           and pushes a single empty trigger commit on PASS —
+                           CI runs once instead of once per iteration.
+                           Use 'every' to restore pre-0.3 per-commit CI.
   --diagnostic-log         Save full Claude event stream to sidecar files
 
 Examples:
@@ -134,6 +139,7 @@ Examples:
   overkill review-loop -n 3 --no-self-review # disable self-review sub-loop
   overkill review-loop --resume              # resume an interrupted run
   overkill review-loop -n 2 --reviewer-backend claude  # use Claude as reviewer
+  overkill review-loop -n 10 --ci-trigger-mode last-only  # CI fires once on PASS
 ```
 
 ## Usage: overkill refactor-suggest

{overkill-0.6.1 → overkill-0.8.0}/README.md

@@ -102,6 +102,11 @@ Options:
   --no-auto-commit         Fix but do not commit/push (single iteration)
   --resume                 Resume from a previously interrupted run (reuses existing logs)
   --reviewer-backend <be>  Reviewer backend: claude|codex (default: codex)
+  --ci-trigger-mode <m>    CI trigger policy: every|last-only|none (default: last-only).
+                           'last-only' tags each iteration commit with [skip ci]
+                           and pushes a single empty trigger commit on PASS —
+                           CI runs once instead of once per iteration.
+                           Use 'every' to restore pre-0.3 per-commit CI.
   --diagnostic-log         Save full Claude event stream to sidecar files
 
 Examples:
@@ -111,6 +116,7 @@ Examples:
   overkill review-loop -n 3 --no-self-review # disable self-review sub-loop
   overkill review-loop --resume              # resume an interrupted run
   overkill review-loop -n 2 --reviewer-backend claude  # use Claude as reviewer
+  overkill review-loop -n 10 --ci-trigger-mode last-only  # CI fires once on PASS
 ```
 
 ## Usage: overkill refactor-suggest

{overkill-0.6.1 → overkill-0.8.0}/prompts/active/claude-review.prompt.md

@@ -62,7 +62,7 @@ We only want findings where you are confident the issue is real. **If you are no
 
 ## Output Format
 
-Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON.
+Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON. Begin your response with the `{` character — no prose, no commentary, no preamble.
 
 {
   "findings": [

{overkill-0.6.1 → overkill-0.8.0}/prompts/active/codex-review.prompt.md

@@ -53,7 +53,7 @@ Output all findings that the original author would fix if they knew about them.
 
 ## Output Format
 
-Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON.
+Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON. Begin your response with the `{` character — no prose, no commentary, no preamble.
 
 {
   "findings": [

{overkill-0.6.1 → overkill-0.8.0}/prompts/active/gemini-review.prompt.md

@@ -62,7 +62,7 @@ We only want findings where you are confident the issue is real. **If you are no
 
 ## Output Format
 
-Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON.
+Output **only** valid JSON matching this schema exactly. Do NOT wrap in markdown fences or add any text outside the JSON. Begin your response with the `{` character — no prose, no commentary, no preamble.
 
 {
   "findings": [

{overkill-0.6.1 → overkill-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "overkill"
-version = "0.6.1"
+version = "0.8.0"
 description = "AI-powered code review loop — automates Codex/Gemini review + Claude fix cycles"
 readme = "README.md"
 license = { text = "MIT" }

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/agents.py

@@ -13,6 +13,7 @@ import logging
 import string
 import subprocess
 from abc import ABC, abstractmethod
+from importlib.resources import as_file, files
 from pathlib import Path
 
 from mr_overkill.budget.claude import claude_budget_sufficient
@@ -45,6 +46,41 @@ def _format_reviewer_context(raw: str) -> str:
     return f"## Author Context\n\n{raw}"
 
 
+# ── Review schema (single source of truth for structured output) ─────
+
+
+def _review_schema_text() -> str:
+    """Read the bundled review JSON Schema as a string."""
+    return files("mr_overkill.data").joinpath("review.schema.json").read_text(
+        encoding="utf-8"
+    )
+
+
+def _unwrap_claude_structured_output(output_path: Path) -> None:
+    """Replace Claude's ``--output-format json`` wrapper with its inner schema object.
+
+    Claude CLI emits ``{"type":"result", ..., "structured_output": {...}, ...}``
+    when both ``--output-format json`` and ``--json-schema`` are set. The
+    schema-conforming object lives under ``structured_output``. Downstream
+    consumers expect the file to contain that object directly. If the file does
+    not match the wrapper shape (older Claude versions, error responses), it is
+    left untouched so the parser's fallback tiers can still try.
+    """
+    try:
+        raw = output_path.read_text(encoding="utf-8")
+    except OSError:
+        return
+    try:
+        wrapper = json.loads(raw)
+    except json.JSONDecodeError:
+        return
+    if not isinstance(wrapper, dict):
+        return
+    inner = wrapper.get("structured_output")
+    if isinstance(inner, dict):
+        output_path.write_text(json.dumps(inner), encoding="utf-8")
+
+
 # ── Budget / retry helpers (moved from review_loop.py) ───────────────
 
 
@@ -183,16 +219,20 @@ class CodexReviewAgent(ReviewAgent):
             )
 
         stderr_path = output_path.with_suffix(".stderr")
-        return retry_codex_cmd(
-            stderr_path,
-            "Codex review",
-            [
-                "codex", "exec", "--sandbox", "read-only",
-                "-o", str(output_path), prompt_text,
-            ],
-            max_wait=config.retry_max_wait,
-            initial_wait=config.retry_initial_wait,
-        )
+        with as_file(
+            files("mr_overkill.data").joinpath("review.schema.json")
+        ) as schema_path:
+            return retry_codex_cmd(
+                stderr_path,
+                "Codex review",
+                [
+                    "codex", "exec", "--sandbox", "read-only",
+                    "--output-schema", str(schema_path),
+                    "-o", str(output_path), prompt_text,
+                ],
+                max_wait=config.retry_max_wait,
+                initial_wait=config.retry_initial_wait,
+            )
 
 
 class CodexRefactorReviewAgent(ReviewAgent):
@@ -284,15 +324,20 @@ class ClaudeReviewAgent(ReviewAgent):
                 f"Claude budget timeout (iteration {iteration})."
             )
 
-        return self._retry_fn(
+        ok = self._retry_fn(
             output_path,
             "Claude review",
             [
                 "claude", "-p", "-",
                 "--allowedTools", "Bash,Read,Glob,Grep",
+                "--output-format", "json",
+                "--json-schema", _review_schema_text(),
             ],
             stdin=prompt_text,
         )
+        if ok:
+            _unwrap_claude_structured_output(output_path)
+        return ok
 
 
 class ClaudeRefactorReviewAgent(ReviewAgent):

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/cli.py

@@ -108,7 +108,7 @@ def _load_rc_file(rc_name: str) -> dict[str, str]:
         "RETRY_INITIAL_WAIT", "BUDGET_SCOPE", "DIAGNOSTIC_LOG",
         "SCOPE", "AUTO_APPROVE", "CREATE_PR", "WITH_REVIEW",
         "REVIEW_LOOPS", "FIX_NITS", "REVIEWER_BACKEND",
-        "REVIEWER_CONTEXT",
+        "REVIEWER_CONTEXT", "CI_TRIGGER_MODE",
     }
     boolean_keys = {
         "DRY_RUN", "AUTO_COMMIT", "DIAGNOSTIC_LOG",
@@ -306,6 +306,18 @@ def parse_review_loop_args(
         default=None,
         help="Additional context for the reviewer (e.g. design intent, constraints)",
     )
+    parser.add_argument(
+        "--ci-trigger-mode",
+        default=None,
+        choices=["every", "last-only", "none"],
+        help=(
+            "CI trigger policy for iteration commits. "
+            "'last-only' (default): append [skip ci] to iteration commits and "
+            "push a single empty 'chore: trigger CI' commit only on PASS. "
+            "'every': every commit triggers CI. "
+            "'none': append [skip ci] with no trigger commit."
+        ),
+    )
 
     args = parser.parse_args(argv)
 
@@ -405,6 +417,10 @@ def parse_review_loop_args(
             saved = log_dir / "reviewer-context.txt"
             if saved.is_file():
                 args.context = saved.read_text().strip()
+        if args.ci_trigger_mode is None:
+            saved = log_dir / "ci-trigger-mode.txt"
+            if saved.is_file():
+                args.ci_trigger_mode = saved.read_text().strip()
 
     if max_loop is not None and max_loop < 1:
         parser.error("--max-loop must be a positive integer")
@@ -420,6 +436,17 @@ def parse_review_loop_args(
         args.context if args.context is not None else rc.get("REVIEWER_CONTEXT", "")
     )
 
+    ci_trigger_mode = (
+        args.ci_trigger_mode
+        if args.ci_trigger_mode is not None
+        else rc.get("CI_TRIGGER_MODE", "last-only")
+    )
+    if ci_trigger_mode not in ("every", "last-only", "none"):
+        parser.error(
+            f"CI_TRIGGER_MODE must be 'every', 'last-only', or 'none',"
+            f" got {ci_trigger_mode!r}"
+        )
+
     return LoopConfig(
         current_branch=current_branch,
         target_branch=target,
@@ -441,6 +468,7 @@ def parse_review_loop_args(
         pr_number=pr_number,
         reviewer_backend=reviewer_backend,
         reviewer_context=reviewer_context,
+        ci_trigger_mode=ci_trigger_mode,
     )
 
 
@@ -713,6 +741,7 @@ def parse_refactor_suggest_args(
         prompts_dir=prompts_dir,
         scope=scope,
         reviewer_backend=reviewer_backend,
+        ci_trigger_mode="every",
     )
 
     extra = _RefactorExtra(

overkill-0.8.0/src/mr_overkill/data/review.schema.json

@@ -0,0 +1,76 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ReviewResult",
+  "type": "object",
+  "required": [
+    "findings",
+    "overall_correctness",
+    "overall_explanation",
+    "overall_confidence_score"
+  ],
+  "additionalProperties": false,
+  "properties": {
+    "findings": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["title", "body", "confidence_score", "priority", "code_location"],
+        "additionalProperties": false,
+        "properties": {
+          "title": {
+            "type": "string",
+            "maxLength": 80,
+            "description": "P-tag + imperative description (max 80 chars)"
+          },
+          "body": {
+            "type": "string",
+            "description": "Markdown explanation; cite files/lines/functions"
+          },
+          "confidence_score": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1
+          },
+          "priority": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 3
+          },
+          "code_location": {
+            "type": "object",
+            "required": ["file_path", "line_range"],
+            "additionalProperties": false,
+            "properties": {
+              "file_path": {
+                "type": "string",
+                "description": "Repo-relative file path"
+              },
+              "line_range": {
+                "type": "object",
+                "required": ["start", "end"],
+                "additionalProperties": false,
+                "properties": {
+                  "start": {"type": "integer", "minimum": 0},
+                  "end": {"type": "integer", "minimum": 0}
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "overall_correctness": {
+      "type": "string",
+      "enum": ["patch is correct", "patch is incorrect"]
+    },
+    "overall_explanation": {
+      "type": "string",
+      "description": "1-3 sentence justification"
+    },
+    "overall_confidence_score": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 1
+    }
+  }
+}

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/git_ops.py

@@ -234,7 +234,12 @@ def commit_and_push(
 
     logger.info("Committed.")
 
-    # Push if upstream exists
+    _push_current_branch(branch=branch, cwd=cwd)
+    return True
+
+
+def _push_current_branch(branch: str = "", cwd: Path | None = None) -> None:
+    """Push the current branch, setting upstream on first push if needed."""
     upstream_check = _run(
         ["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
         cwd=cwd,
@@ -244,7 +249,8 @@ def commit_and_push(
         if push_result.returncode != 0:
             raise RuntimeError(f"git push failed: {push_result.stderr.strip()}")
         logger.info("Pushed.")
-    elif branch:
+        return
+    if branch:
         remote_check = _run(["git", "remote"], cwd=cwd)
         remotes = remote_check.stdout.strip().splitlines()
         remote = "origin" if "origin" in remotes else (remotes[0] if remotes else "")
@@ -253,9 +259,40 @@ def commit_and_push(
             if push_result.returncode != 0:
                 raise RuntimeError(f"git push failed: {push_result.stderr.strip()}")
             logger.info("Pushed (upstream set).")
-        else:
-            logger.info("No upstream/remote set — skipping push.")
-    else:
-        logger.info("No upstream set — skipping push.")
+            return
+        logger.info("No upstream/remote set — skipping push.")
+        return
+    logger.info("No upstream set — skipping push.")
+
+
+def push_trigger_commit(branch: str = "", cwd: Path | None = None) -> bool:
+    """Push an empty ``chore: trigger CI`` commit.
+
+    Used by ``--ci-trigger-mode last-only`` to fire CI once after a run of
+    iteration commits that were each tagged with ``[skip ci]``. Returns
+    ``True`` on success, ``False`` if the empty commit could not be created
+    (e.g. repo has no HEAD yet). Raises ``RuntimeError`` if ``git push`` fails.
+
+    Idempotent: if HEAD already lacks ``[skip ci]`` (a prior call succeeded
+    locally but the push may not have reached the remote), skip creating
+    another empty commit and just retry the push.
+    """
+    head_msg = _run(["git", "log", "-1", "--pretty=%B"], cwd=cwd).stdout
+    if head_msg and "[skip ci]" not in head_msg:
+        logger.info("HEAD already triggers CI — retrying push only.")
+        _push_current_branch(branch=branch, cwd=cwd)
+        return True
 
+    result = _run(
+        ["git", "commit", "--allow-empty", "-m", "chore: trigger CI"],
+        cwd=cwd,
+    )
+    if result.returncode != 0:
+        logger.warning(
+            "trigger commit failed: %s",
+            result.stderr.strip() or result.stdout.strip(),
+        )
+        return False
+    logger.info("Created CI trigger commit.")
+    _push_current_branch(branch=branch, cwd=cwd)
     return True

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/json_extract.py

@@ -1,7 +1,7 @@
 """JSON extraction utilities ported from common.sh and self-review.sh.
 
 Provides a 3-tier extraction pipeline (direct parse -> fenced code block ->
-regex fallback) that mirrors _extract_json_from_file in the shell codebase,
+balanced-brace scan) that mirrors _extract_json_from_file in the shell codebase,
 plus helpers for path normalisation and refactoring-plan injection.
 """
 
@@ -24,7 +24,9 @@ def extract_json_from_file(path: Path) -> dict[str, Any] | None:
     Tier 2: Look for a fenced code block (`` ```json ... ``` ``) and parse its
     content.
 
-    Tier 3: Use a greedy regex to extract the outermost ``{ ... }`` and parse.
+    Tier 3: Scan every ``{`` position with ``json.JSONDecoder().raw_decode()``
+    and return the largest valid dict found. Robust to prose with embedded
+    braces (e.g. preambles that mention schemas).
 
     Returns
     -------
@@ -53,8 +55,8 @@ def extract_json_from_file(path: Path) -> dict[str, Any] | None:
     if result is not None:
         return result
 
-    # ── Tier 3: regex fallback ────────────────────────────────────────
-    return _try_regex_fallback(content)
+    # ── Tier 3: balanced-brace scan ───────────────────────────────────
+    return _try_balanced_scan(content)
 
 
 def parse_review_json(
@@ -188,18 +190,28 @@ def _try_fenced_block(content: str) -> dict[str, Any] | None:
     return None
 
 
-_BRACE_RE = re.compile(r"\{.*\}", re.DOTALL)
+def _try_balanced_scan(content: str) -> dict[str, Any] | None:
+    """Tier 3: try ``raw_decode`` from each ``{`` position, keep the largest dict.
 
-
-def _try_regex_fallback(content: str) -> dict[str, Any] | None:
-    """Tier 3: greedy regex for the outermost ``{ ... }``."""
-    match = _BRACE_RE.search(content)
-    if match is None:
-        return None
-    try:
-        obj = json.loads(match.group(0))
-        if isinstance(obj, dict):
-            return obj
-    except json.JSONDecodeError:
-        pass
-    return None
+    Greedy regex (``\\{.*\\}``) breaks when prose preceding the JSON contains
+    its own ``{`` — the match starts at the prose brace and consumes the rest
+    of the file as one invalid string. ``raw_decode`` walks the JSON grammar
+    and stops at the matching brace, so each candidate is parsed correctly.
+    """
+    decoder = json.JSONDecoder()
+    best: dict[str, Any] | None = None
+    best_len = 0
+    idx = 0
+    while True:
+        idx = content.find("{", idx)
+        if idx < 0:
+            break
+        try:
+            obj, end = decoder.raw_decode(content, idx)
+        except json.JSONDecodeError:
+            idx += 1
+            continue
+        if isinstance(obj, dict) and (end - idx) > best_len:
+            best, best_len = obj, end - idx
+        idx = end if end > idx else idx + 1
+    return best

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/loop_engine.py

@@ -218,10 +218,20 @@ def review_fix_loop(
         # Already-completed runs can short-circuit after branch validation
         if state.status == "completed":
             resolved_status = FinalStatus(state.prev_status or "max_iterations_reached")
+            # Re-attempt the CI trigger push: a prior run may have written
+            # the terminal summary but failed (or been interrupted) before
+            # pushing the trigger commit, leaving the remote on a [skip ci]
+            # commit. push_trigger_commit is idempotent.
+            needs_trigger = (
+                resolved_status == FinalStatus.ALL_CLEAR
+                and config.ci_trigger_mode in ("last-only", "none")
+                and _has_skipped_fix_commit(commit_pattern, log_dir, cwd)
+            )
             return LoopResult(
                 final_status=resolved_status,
                 iterations_run=0,
                 summary_path=_generate_summary_safe(config, resolved_status),
+                made_skipped_fix_commit=needs_trigger,
             )
 
         resume_from = state.resume_from
@@ -285,6 +295,14 @@ def review_fix_loop(
     allowed_stashed = False
     had_findings = False
     fix_committed = False
+    # On resume, prior iteration commits already exist; in last-only/none
+    # modes those carry [skip ci], so a final trigger commit is still needed
+    # even if no new fix commit is made in this process.
+    made_skipped_fix_commit = (
+        config.resume
+        and resume_from > 1
+        and config.ci_trigger_mode in ("last-only", "none")
+    )
 
     for i in range(1, config.max_loop + 1):
         logger.info("── Iteration %d / %d ──", i, config.max_loop)
@@ -489,8 +507,11 @@ def review_fix_loop(
 
             # j. Commit & push
             if config.auto_commit:
+                subject = f"{commit_pattern} {i} fixes"
+                if config.ci_trigger_mode in ("last-only", "none"):
+                    subject += " [skip ci]"
                 commit_msg = (
-                    f"{commit_pattern} {i} fixes\n\n"
+                    f"{subject}\n\n"
                     f"Auto-generated by review loop (iteration {i}/{config.max_loop})"
                 )
                 if self_review_summary:
@@ -509,6 +530,8 @@ def review_fix_loop(
                     final_status = FinalStatus.COMMIT_PUSH_ERROR
                     iterations_run = i
                     break
+                if fix_committed and config.ci_trigger_mode in ("last-only", "none"):
+                    made_skipped_fix_commit = True
             else:
                 logger.info("AUTO_COMMIT is disabled — skipping commit and push.")
         finally:
@@ -552,12 +575,37 @@ def review_fix_loop(
         final_status=final_status,
         iterations_run=iterations_run,
         summary_path=summary_path,
+        made_skipped_fix_commit=made_skipped_fix_commit,
     )
 
 
 # ── Private helpers ──────────────────────────────────────────────────
 
 
+def _has_skipped_fix_commit(
+    commit_pattern: str, log_dir: Path, cwd: Path | None
+) -> bool:
+    """Return True if any [skip ci] fix commit exists since the run started."""
+    start_file = log_dir / "start-commit.txt"
+    if not start_file.is_file():
+        return False
+    start = start_file.read_text().strip()
+    if not start:
+        return False
+    result = subprocess.run(
+        [
+            "git", "log", "--fixed-strings",
+            f"--grep={commit_pattern}", "--grep=[skip ci]", "--all-match",
+            "--oneline", f"{start}..HEAD",
+        ],
+        cwd=cwd,
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    return result.returncode == 0 and bool(result.stdout.strip())
+
+
 def _validate_target_branch(target: str, cwd: Path | None) -> bool:
     """Return True if *target* is a valid git ref."""
     result = subprocess.run(
@@ -636,6 +684,7 @@ def _save_metadata(config: LoopConfig, cwd: Path | None) -> None:
     (log_dir / "max-loop.txt").write_text(str(config.max_loop))
     (log_dir / "reviewer-backend.txt").write_text(config.reviewer_backend)
     (log_dir / "reviewer-context.txt").write_text(config.reviewer_context)
+    (log_dir / "ci-trigger-mode.txt").write_text(config.ci_trigger_mode)
     if config.scope:
         (log_dir / "scope.txt").write_text(config.scope)
 

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/models.py

@@ -162,6 +162,14 @@ class LoopConfig:
     resume: bool = False
     auto_approve: bool = False
 
+    # CI trigger policy for iteration commits:
+    #   "last-only" — default: append "[skip ci]" to iteration commits; push a
+    #                 single empty "chore: trigger CI" commit only on ALL_CLEAR.
+    #   "every"     — each commit triggers CI (pre-0.3 behaviour).
+    #   "none"      — append "[skip ci]" to iteration commits; never emit a
+    #                 trigger commit (forks / CI-less repos).
+    ci_trigger_mode: str = "last-only"
+
     # Retry / budget
     retry_max_wait: int = 7200
     retry_initial_wait: int = 30
@@ -193,6 +201,7 @@ class LoopResult:
     final_status: FinalStatus
     iterations_run: int
     summary_path: Path | None = None
+    made_skipped_fix_commit: bool = False
 
 
 # ── Protocols (DI contracts) ─────────────────────────────────────────

{overkill-0.6.1 → overkill-0.8.0}/src/mr_overkill/retry.py

@@ -26,9 +26,13 @@ BUDGET_POLL_MAX = 1200
 
 
 def extract_result_from_stream(stream_path: Path) -> str:
-    """Extract final result text from a Claude stream-json event log.
+    """Extract final result from a Claude stream-json event log.
 
-    Returns empty string if the file is empty or no result event found.
+    When the ``result`` event includes a ``structured_output`` object
+    (set by ``--json-schema``), the JSON-encoded structured object is
+    returned so downstream parsers receive schema-conforming JSON.
+    Otherwise the plain ``result`` text is returned. Returns empty
+    string if the file is empty or no result event is found.
     """
     if not stream_path.is_file() or stream_path.stat().st_size == 0:
         return ""
@@ -39,10 +43,13 @@ def extract_result_from_stream(stream_path: Path) -> str:
             continue
         try:
             data = json.loads(line)
-            if data.get("result"):
-                last_result = data["result"]
-        except (json.JSONDecodeError, KeyError):
+        except json.JSONDecodeError:
             continue
+        structured = data.get("structured_output")
+        if isinstance(structured, dict):
+            last_result = json.dumps(structured)
+        elif data.get("result"):
+            last_result = data["result"]
     return last_result