bugzero 0.0.31 → 0.0.33

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> bugzero@0.0.31 build /home/runner/work/Bugzero/Bugzero/apps/bugzero
+> bugzero@0.0.33 build /home/runner/work/Bugzero/Bugzero/apps/bugzero
 > tsup src/index.ts --format cjs --dts
 
 CLI Building entry: src/index.ts
@@ -7,8 +7,8 @@
 CLI tsup v8.5.1
 CLI Target: es2022
 CJS Build start
-CJS dist/index.js 74.91 KB
-CJS ⚡️ Build success in 34ms
+CJS dist/index.js 77.80 KB
+CJS ⚡️ Build success in 33ms
 DTS Build start
-DTS ⚡️ Build success in 1100ms
+DTS ⚡️ Build success in 784ms
 DTS dist/index.d.ts 20.00 B

package/README.md

@@ -1,14 +1,31 @@
-# BugZero
+<div align="center">
+
+# 🐛 BugZero
+
+### Your build breaks. BugZero fixes it. Automatically.
 
 [![npm version](https://img.shields.io/npm/v/bugzero.svg?style=flat-square)](https://www.npmjs.com/package/bugzero)
+[![npm downloads](https://img.shields.io/npm/dm/bugzero.svg?style=flat-square)](https://www.npmjs.com/package/bugzero)
+[![CI](https://img.shields.io/github/actions/workflow/status/Saksham1800t/Bugzero/ci.yml?branch=main&label=CI&style=flat-square)](https://github.com/Saksham1800t/Bugzero/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://opensource.org/licenses/MIT)
 [![Node.js](https://img.shields.io/badge/Node.js-18%2B-green?style=flat-square)](https://nodejs.org)
 [![pnpm](https://img.shields.io/badge/maintained%20with-pnpm-cc00ff.svg?style=flat-square)](https://pnpm.io/)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/Saksham1800t)
 
-**BugZero** is an autonomous, AI-powered CLI tool for automatic build error detection and repair. It runs your build pipeline, parses compiler and linter output, invokes an LLM to generate a surgical code fix, applies it safely with a backup, and re-runs validation — looping until your project builds successfully or the attempt limit is reached.
+**BugZero** is an autonomous, AI-powered CLI that detects and repairs build, lint, and test failures — locally or as a GitHub Action that opens the fix as a pull request.
 
-Built for developers who want zero-downtime repair cycles, automated CI/CD recovery, and production-grade error resolution without manual debugging.
+</div>
+
+---
+
+## ⚡ Quick Start
+
+```bash
+npm install -g bugzero
+export OPENROUTER_API_KEY="your_openrouter_api_key_here"
+bugzero rescue --path /path/to/your/project
+```
+
+That's it — BugZero runs your build, diagnoses the failure, generates a patch, applies it, and re-verifies, looping until it's green or it runs out of attempts.
 
 ---
 
@@ -16,75 +33,117 @@ Built for developers who want zero-downtime repair cycles, automated CI/CD recov
 
 Modern applications fail at build and deployment time for reasons that are repetitive, predictable, and ultimately fixable by a knowledgeable agent. BugZero bridges the gap between raw compiler output and working code — automatically.
 
-- **No more debugging the same TypeScript error twice.** The agent reads the stack trace, finds the file, generates the fix, and verifies it.
-- **Safe by design.** Every file modified gets a `.opspilot.bak` backup before any change is applied.
-- **Model agnostic.** Works with DeepSeek, Claude, Gemini, GPT-4o, Llama, or any model available on OpenRouter.
-- **Feedback loop included.** The LangGraph state machine retries intelligently until the build passes or the max attempts threshold is hit.
+- 🔁 **No more debugging the same TypeScript error twice.** The agent reads the error, finds the file, generates the fix, and verifies it.
+- 🛡️ **Safe by design.** Every modified file gets a `.opspilot.bak` backup, and a multi-file fix is applied and rolled back as one atomic unit.
+- 🎯 **Forgiving, not brittle.** If the AI's suggested patch doesn't match the file byte-for-byte, BugZero falls back to whitespace-normalized and similarity-scored matching before giving up.
+- 🧠 **Model agnostic.** DeepSeek, Claude, Gemini, GPT-4o, Llama, or any model on OpenRouter.
+- 🤖 **CI-native.** Run it as a GitHub Action instead of a local CLI, and let it open the fix as a PR.
 
 ---
 
-## How it Works
+## How It Works
 
 ```
 bugzero rescue
-      |
-      v
+      │
+      ▼
  Run Build + Lint + Tests
-      |
-      v
- Any failures? ---- No ---> Build already passing. Exit cleanly.
-      |
+      │
+      ▼
+ Any failures? ── No ──▶ Build already passing. Exit cleanly.
+      │
      Yes
-      |
-      v
+      │
+      ▼
  Capture and parse error logs
-      |
-      v
+      │
+      ▼
  Prompt selected LLM via LangGraph Agent
-      |
-      v
- Parse structured fix suggestion (JSON)
-      |
-      v
- Apply search-and-replace patch (with .bak backup)
-      |
-      v
+      │
+      ▼
+ Parse structured fix suggestion (one or more file patches)
+      │
+      ▼
+ Apply patches atomically (exact → whitespace → similarity match, with .bak backups)
+      │
+      ▼
  Re-run build to verify the fix
-      |
-      v
- Build fixed? --- Yes ---> Print fix details. Exit success.
-      |
+      │
+      ▼
+ Build fixed? ── Yes ──▶ Print fix details. Exit success.
+      │
       No
-      |
-      v
- Max attempts reached? -- Yes ---> Exit with failure logs.
-      |
+      │
+      ▼
+ Max attempts reached? ── Yes ──▶ Exit with failure logs.
+      │
       No
-      |
-      +-------------------> Prompt LLM again (next attempt)
+      │
+      └──────────────────▶ Prompt LLM again (next attempt)
 ```
 
 ---
 
-## Key Features
+## ✨ Key Features
 
 | Feature | Description |
 |---|---|
 | Autonomous repair loop | Runs analyze, patch, verify in a stateful LangGraph graph |
 | Multi-model support | DeepSeek, Claude, GPT-4o, Gemini, Llama via OpenRouter |
 | Framework detection | Automatically identifies your project's tooling setup |
+| **Multi-file patches** | A single fix attempt can edit several files at once, applied atomically — if any file's patch fails, every file touched in that attempt is rolled back |
+| **Fuzzy patch matching** | Falls back from exact match to whitespace-normalized and similarity-scored matching when the AI's snippet doesn't match the file verbatim |
 | Safe file patching | Every modified file receives a `.opspilot.bak` backup |
-| Fuzzy patch matching | Falls back from exact match to whitespace-normalized and similarity-scored matching when the AI's snippet doesn't match the file verbatim |
 | Error type parsing | Parses TypeScript, ESLint, and Jest error formats |
 | Dry-run mode | Analyze and report without writing any files |
 | Local model config | Save preferred model to `.bugzerorc` per project |
-| Markdown Reports | Automatically generates a detailed Markdown report at `bugzero-report.md` in the target project path and outputs clickable file URLs in the terminal to open them instantly. |
+| Markdown Reports | Auto-generates a detailed `bugzero-report.md` with error logs, model name, token usage, and code diffs — plus a clickable link straight to your terminal |
+| **GitHub Action mode** | Run the same repair loop in CI and open a pull request with the fix instead of patching a local checkout — see below |
+
+---
+
+## 🤖 GitHub Action Mode
+
+Instead of running BugZero on your machine, run it in CI: when a check fails, it opens a pull request with the fix instead of patching your local checkout.
+
+```yaml
+name: BugZero Auto-Fix
+
+on:
+  workflow_run:
+    workflows: ["CI"]
+    types: [completed]
+
+jobs:
+  fix:
+    if: github.event.workflow_run.conclusion == 'failure'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
+
+      - uses: pnpm/action-setup@v4 # or npm/yarn — whatever installs your project's deps
+      - run: pnpm install
+
+      - uses: Saksham1800t/Bugzero@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          base-branch: ${{ github.event.workflow_run.head_branch }}
+        env:
+          OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
+```
+
+It commits every changed file as a single atomic commit via the GitHub API — no local git push needed — then opens the PR. Full input/output reference: [`apps/github-action`](https://github.com/Saksham1800t/Bugzero/tree/main/apps/github-action).
 
 ---
 
 ## Installation
 
-Install globally from the NPM registry:
+Install globally from the npm registry:
 
 ```bash
 npm install -g bugzero
@@ -129,7 +188,8 @@ Run the full AI-powered repair loop. Detects build failures, generates precise c
 bugzero rescue --path /path/to/your/project
 ```
 
-Options:
+<details>
+<summary><strong>Options for <code>rescue</code></strong></summary>
 
 | Flag | Short | Default | Description |
 |---|---|---|---|
@@ -137,6 +197,8 @@ Options:
 | `--max-attempts <n>` | `-n` | `3` | Maximum AI fix iterations before giving up |
 | `--dry-run` | | `false` | Analyze only — no files will be written |
 
+</details>
+
 ### `bugzero vibe`
 Interactively select which AI model to use. Fetches the current model list from OpenRouter, lets you pick one, and saves the selection to a local `.bugzerorc` config file.
 
@@ -144,13 +206,17 @@ Interactively select which AI model to use. Fetches the current model list from
 bugzero vibe
 ```
 
-Supported models (curated list, plus custom entry):
+<details>
+<summary><strong>Supported models</strong> (curated list, plus custom entry)</summary>
+
 - DeepSeek V3 / DeepSeek R1
 - Anthropic Claude 3.5 Sonnet
 - Google Gemini 2.5 Pro / Flash
 - OpenAI GPT-4o
 - Meta Llama 3.3 Instruct
 
+</details>
+
 ---
 
 ## Configuration
@@ -169,33 +235,45 @@ This file is created automatically when you run `bugzero vibe`.
 
 ## Reports
 
-Every time you run `bugzero hunt` or `bugzero rescue`, a detailed Markdown report is generated at `bugzero-report.md` in the target project directory. The tool prints a clickable absolute file URL and path directly to your terminal. Clicking the link instantly opens the report inside your active IDE editor with full syntax styling and Markdown Preview. The report includes:
+Every time you run `bugzero hunt` or `bugzero rescue`, a detailed Markdown report is generated at `bugzero-report.md` in the target project directory. The tool prints a clickable absolute file URL and path directly to your terminal.
+
 - **Pipeline Summary:** Clear status checklist of your project's Build, Lint, and Test suites.
 - **Detailed Error Outputs:** Full error logs from any failing checks.
 - **AI Brain Details:** The exact OpenRouter model used.
 - **Token Usage:** Accumulated prompt and completion tokens used for the run.
-- **Applied Fixes (for rescue):** The root cause, explanation, and before/after search-replace code diffs of any patches applied.
+- **Applied Fixes (for rescue):** The root cause, explanation, and before/after diffs for every file patched.
 
 ---
 
-## Development Setup
+## Error Handling
 
-Clone the repository and install dependencies. This project uses a pnpm monorepo managed by Turborepo.
+BugZero provides clear, actionable output for common failure modes:
+
+| Error | Message |
+|---|---|
+| Invalid API key (401) | Prompts you to check your `OPENROUTER_API_KEY` |
+| Rate limit exceeded (429) | Prompts you to check your OpenRouter credit balance |
+| Model not found | Displays the invalid model ID and suggests running `bugzero vibe` |
+| Patch not applied | Reports exact mismatch between AI suggestion and file content, after exhausting exact, whitespace, and fuzzy matching |
+| Max attempts reached | Exits cleanly with the last error log for manual review |
+
+---
+
+<details>
+<summary><strong>🛠️ Development Setup</strong> (contributing to BugZero itself)</summary>
+
+Clone the repository and install dependencies. This project uses a pnpm monorepo managed by Turborepo, with a Vitest test suite and GitHub Actions CI.
 
 ### Prerequisites
 - Node.js 18 or later
 - pnpm
 
-### Install
+### Install & build
 
 ```bash
 pnpm install
-```
-
-### Build all packages
-
-```bash
 pnpm build
+pnpm test
 ```
 
 ### Run commands locally without installing globally
@@ -206,33 +284,22 @@ pnpm rescue --path ./demo-project
 pnpm vibe
 ```
 
-### Monorepo package structure
+### Monorepo structure
 
 | Package | Role |
 |---|---|
-| `packages/cli` | CLI entrypoint (Commander) |
+| `apps/bugzero` | CLI entrypoint (Commander) — the package published to npm |
+| `apps/github-action` | GitHub Action wrapper — runs the repair loop in CI and opens a fix PR |
 | `packages/core` | Orchestrates build and fix flow |
 | `packages/agents` | LangGraph state machine (analyze, patch, verify) |
 | `packages/ai-provider` | OpenRouter HTTP client |
 | `packages/analyzers` | Runs build/lint/test and parses output |
-| `packages/patcher` | Applies search-and-replace patches with backup |
+| `packages/patcher` | Applies search-and-replace patches — with atomic multi-file support and fuzzy-match fallback |
 | `packages/prompts` | LLM prompt templates |
 | `packages/config` | Env loading and local `.bugzerorc` config store |
 | `packages/shared` | Shared TypeScript types |
 
----
-
-## Error Handling
-
-BugZero provides clear, actionable output for common failure modes:
-
-| Error | Message |
-|---|---|
-| Invalid API key (401) | Prompts you to check your `OPENROUTER_API_KEY` |
-| Rate limit exceeded (429) | Prompts you to check your OpenRouter credit balance |
-| Model not found | Displays the invalid model ID and suggests running `bugzero vibe` |
-| Patch not applied | Reports exact mismatch between AI suggestion and file content |
-| Max attempts reached | Exits cleanly with the last error log for manual review |
+</details>
 
 ---
 
@@ -251,4 +318,3 @@ BugZero provides clear, actionable output for common failure modes:
 If BugZero saved you debugging hours in production or deployment pipelines, consider buying the author a coffee.
 
 [![Buy Me A Coffee](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/saksham_)
-

package/dist/index.js

@@ -908,21 +908,27 @@ ${compilerLogs}
 Your task:
 1. Root Cause: Identify the root cause of the build failure.
 2. Codebase Context: Read the provided file contents and directory listings under "\u{1F4C1} Codebase Context" to locate the correct files, imports, and file paths. Do not guess filenames or contents that are not in the context.
-3. Patch: Provide the minimal, precise fix.
+3. Patch: Provide the minimal, precise fix. If the fix genuinely requires changes in more than one file (for example, a renamed export and every place that imports it), include one patch entry per file \u2014 all patches in your response are applied together, atomically.
 
 Reply with ONLY a valid JSON object in this exact shape \u2014 no markdown fences, no extra text:
 {
   "rootCause": "One-sentence explanation of the error",
-  "filePath": "relative/path/from/project/root/to/file.ts",
-  "search": "exact code that currently exists in the file and must be replaced",
-  "replace": "the corrected code that replaces the search string",
-  "explanation": "short explanation of what you changed and why"
+  "explanation": "short explanation of what you changed and why",
+  "patches": [
+    {
+      "filePath": "relative/path/from/project/root/to/file.ts",
+      "search": "exact code that currently exists in the file and must be replaced",
+      "replace": "the corrected code that replaces the search string"
+    }
+  ]
 }
 
 Critical rules:
-- "filePath" must be a relative path from the project root (no leading /).
-- "search" must be an EXACT character-for-character substring of the current file content.
-- "replace" must be syntactically valid code.
+- "patches" must contain at least one entry. Only include more than one when the fix truly requires editing multiple files \u2014 most fixes need just one.
+- Each "filePath" must be a relative path from the project root (no leading /).
+- Each "search" must be an EXACT character-for-character substring of that file's current content.
+- Each "replace" must be syntactically valid code.
+- If two patches target the same file, list them in the order they should be applied, and make sure each "search" reflects the file's content *after* the previous patch in this list has been applied to it.
 - Do NOT add backticks, markdown, or any text outside the JSON object.`;
     }
   }
@@ -962,6 +968,7 @@ var require_dist5 = __commonJS({
     var index_exports = {};
     __export(index_exports, {
       applyPatch: () => applyPatch,
+      applyPatches: () => applyPatches,
       findMatch: () => findMatch,
       lineSimilarity: () => lineSimilarity
     });
@@ -1092,6 +1099,62 @@ var require_dist5 = __commonJS({
         return { success: false, error: err.message };
       }
     }
+    var import_fs2 = __toESM2(require("fs"));
+    var import_path22 = __toESM2(require("path"));
+    function rollback(originalContent, backupPaths) {
+      for (const [absolutePath, content] of originalContent) {
+        try {
+          import_fs2.default.writeFileSync(absolutePath, content, "utf-8");
+        } catch {
+        }
+      }
+      for (const backupPath of backupPaths) {
+        try {
+          import_fs2.default.unlinkSync(backupPath);
+        } catch {
+        }
+      }
+    }
+    function applyPatches(cwd, patches) {
+      if (patches.length === 0) {
+        return { success: false, error: "No patches to apply.", applied: [] };
+      }
+      const originalContent = /* @__PURE__ */ new Map();
+      const backupPaths = /* @__PURE__ */ new Set();
+      const applied = [];
+      for (const patch of patches) {
+        const absolutePath = import_path22.default.resolve(cwd, patch.filePath);
+        if (!originalContent.has(absolutePath)) {
+          try {
+            originalContent.set(absolutePath, import_fs2.default.readFileSync(absolutePath, "utf-8"));
+          } catch {
+            rollback(originalContent, backupPaths);
+            return {
+              success: false,
+              error: `Failed to patch "${patch.filePath}": File not found: ${absolutePath}`,
+              applied: []
+            };
+          }
+        }
+        const result = applyPatch(absolutePath, patch.search, patch.replace);
+        if (result.backupPath) backupPaths.add(result.backupPath);
+        if (!result.success) {
+          rollback(originalContent, backupPaths);
+          return {
+            success: false,
+            error: `Failed to patch "${patch.filePath}": ${result.error}`,
+            applied: []
+          };
+        }
+        applied.push({
+          filePath: patch.filePath,
+          absolutePath,
+          backupPath: result.backupPath,
+          matchStrategy: result.matchStrategy
+        });
+      }
+      return { success: true, applied };
+    }
   }
 });
 
@@ -1099,11 +1162,9 @@ var require_dist5 = __commonJS({
 var require_dist6 = __commonJS({
   "../../packages/agents/dist/index.js"(exports2, module2) {
     "use strict";
-    var __create2 = Object.create;
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __getProtoOf2 = Object.getPrototypeOf;
     var __hasOwnProp2 = Object.prototype.hasOwnProperty;
     var __export = (target, all) => {
       for (var name in all)
@@ -1117,14 +1178,6 @@ var require_dist6 = __commonJS({
       }
       return to;
     };
-    var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-      // If the importer is in node compatibility mode or this is not an ESM
-      // file that has been converted to a CommonJS file using a Babel-
-      // compatible transform (i.e. "__esModule" has not been set), then set
-      // "default" to the CommonJS "module.exports" for node compatibility.
-      isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
-      mod
-    ));
     var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var index_exports = {};
     __export(index_exports, {
@@ -1132,7 +1185,6 @@ var require_dist6 = __commonJS({
     });
     module2.exports = __toCommonJS(index_exports);
     var import_langgraph2 = require("@langchain/langgraph");
-    var import_path2 = __toESM2(require("path"));
     var import_langgraph = require("@langchain/langgraph");
     var GraphState = import_langgraph.Annotation.Root({
       /** Absolute path to the project being fixed */
@@ -1204,7 +1256,12 @@ var require_dist6 = __commonJS({
         const cleaned = response.replace(/```json\n?/g, "").replace(/```\n?/g, "").trim();
         const jsonMatch = cleaned.match(/\{[\s\S]*\}/);
         if (jsonMatch) {
-          fixSuggestion = JSON.parse(jsonMatch[0]);
+          const parsed = JSON.parse(jsonMatch[0]);
+          if (Array.isArray(parsed.patches) && parsed.patches.length > 0) {
+            fixSuggestion = parsed;
+          } else {
+            console.warn('[BugZero] AI response JSON did not contain a non-empty "patches" array.');
+          }
         } else {
           console.warn("[BugZero] AI response did not contain a valid JSON object.");
         }
@@ -1225,26 +1282,27 @@ var require_dist6 = __commonJS({
         console.warn("[BugZero] No fix suggestion available \u2014 skipping patch.");
         return {};
       }
-      const { filePath, search, replace, explanation } = state.fixSuggestion;
-      const absolutePath = import_path2.default.resolve(state.cwd, filePath);
-      console.log(`[BugZero] Patching: ${filePath}`);
+      const { patches, explanation } = state.fixSuggestion;
+      const fileList = patches.map((p) => p.filePath).join(", ");
+      console.log(`[BugZero] Patching ${patches.length} file${patches.length === 1 ? "" : "s"}: ${fileList}`);
       console.log(`[BugZero] Reason:   ${explanation}`);
-      const result = (0, import_patcher.applyPatch)(absolutePath, search, replace);
+      const result = (0, import_patcher.applyPatches)(state.cwd, patches);
       if (!result.success) {
         console.error(`[BugZero] Patch failed: ${result.error}`);
         const updatedLogs = `${state.logs}
 
-\u26A0\uFE0F [BugZero System Warning] Your previous patch suggestion for "${filePath}" failed with the following error:
+\u26A0\uFE0F [BugZero System Warning] Your previous patch suggestion failed with the following error:
 - ${result.error}
 
-Please check if the file path is correct relative to the project root and make sure you target the correct file that contains the build error.`;
+Any other files from that same suggestion were rolled back to keep the change atomic. Please check if the file path(s) are correct relative to the project root and make sure you target the correct file(s) that contain the build error.`;
         return {
           logs: updatedLogs
         };
-      } else {
-        console.log(`[BugZero] Backup saved to: ${result.backupPath}`);
-        if (result.matchStrategy && result.matchStrategy !== "exact") {
-          console.log(`[BugZero] Note: exact match failed \u2014 patch applied via ${result.matchStrategy} matching.`);
+      }
+      for (const applied of result.applied) {
+        console.log(`[BugZero] Backup saved to: ${applied.backupPath}`);
+        if (applied.matchStrategy !== "exact") {
+          console.log(`[BugZero] Note: exact match failed for ${applied.filePath} \u2014 patch applied via ${applied.matchStrategy} matching.`);
         }
       }
       return {};
@@ -1432,6 +1490,30 @@ var require_dist7 = __commonJS({
       });
       return result;
     }
+    function formatPatchesForPrompt(appliedFix) {
+      return appliedFix.patches.map(
+        (p, i) => `File ${i + 1}: ${p.filePath}
+- Search code:
+${p.search}
+- Replace code:
+${p.replace}`
+      ).join("\n\n");
+    }
+    function formatPatchesMarkdown(appliedFix) {
+      return appliedFix.patches.map(
+        (p) => `**File:** \`${p.filePath}\`
+
+**Search (Before):**
+\`\`\`typescript
+${p.search}
+\`\`\`
+
+**Replace (After):**
+\`\`\`typescript
+${p.replace}
+\`\`\``
+      ).join("\n\n---\n\n");
+    }
     async function writeReport(cwd, type, data) {
       let content = "";
       const provider = new import_ai_provider.OpenRouterProvider();
@@ -1510,14 +1592,12 @@ ${logs}
         const { success, attempts, maxAttempts, appliedFix, error, rawOutput, modelUsed, promptTokens, completionTokens } = data;
         if (success && appliedFix) {
           console.log("[BugZero] Calling AI to write solution summary report...");
-          const prompt = `You are an expert software engineer assistant. An automated AI agent successfully resolved a build/lint/test failure in a project located at "${cwd}" after ${attempts} attempts by applying a patch to "${appliedFix.filePath}".
+          const patchedFiles = appliedFix.patches.map((p) => p.filePath).join(", ");
+          const prompt = `You are an expert software engineer assistant. An automated AI agent successfully resolved a build/lint/test failure in a project located at "${cwd}" after ${attempts} attempts by applying a patch to: ${patchedFiles}.
 Here is the patch details:
 - Root Cause: ${appliedFix.rootCause}
 - Explanation: ${appliedFix.explanation}
-- Search code:
-${appliedFix.search}
-- Replace code:
-${appliedFix.replace}
+${formatPatchesForPrompt(appliedFix)}
 
 Please generate a professional, beautifully formatted Markdown report summarizing:
 1. **Repair Summary:** Celebrate the success and explain the fix.
@@ -1550,20 +1630,12 @@ Generate the Markdown report directly. Do not wrap it in markdown block fences (
 - **Token Usage:** ${promptTokens !== void 0 && completionTokens !== void 0 ? `Prompt: **${promptTokens}** | Completion: **${completionTokens}** | Total: **${promptTokens + completionTokens}**` : "*N/A*"}
 
 ## \u{1F6E0}\uFE0F Applied Solution
-- **Target File:** \`${appliedFix.filePath}\`
+- **Target File(s):** ${appliedFix.patches.map((p) => `\`${p.filePath}\``).join(", ")}
 - **Root Cause:** ${appliedFix.rootCause}
 - **Explanation:** ${appliedFix.explanation}
 
 ### \u{1F4DD} Code Changes
-**Search (Before):**
-\`\`\`typescript
-${appliedFix.search}
-\`\`\`
-
-**Replace (After):**
-\`\`\`typescript
-${appliedFix.replace}
-\`\`\`
+${formatPatchesMarkdown(appliedFix)}
 `;
           }
         } else {
@@ -1693,7 +1765,8 @@ program.command("rescue").description("Detect build failures and automatically a
         console.log(`   Tokens: Prompt: ${result.promptTokens} | Completion: ${result.completionTokens} | Total: ${result.promptTokens + result.completionTokens}`);
       }
       if (result.appliedFix) {
-        console.log(`   File:   ${result.appliedFix.filePath}`);
+        const files = result.appliedFix.patches.map((p) => p.filePath).join(", ");
+        console.log(`   File${result.appliedFix.patches.length === 1 ? "" : "s"}:   ${files}`);
         console.log(`   Reason: ${result.appliedFix.explanation}`);
         console.log(`   Root cause: ${result.appliedFix.rootCause}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bugzero",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "An autonomous, AI-powered CLI tool for automatic build error detection and repair.",
   "license": "MIT",
   "bin": {

package/src/index.ts

@@ -75,7 +75,8 @@ program
           console.log(`   Tokens: Prompt: ${result.promptTokens} | Completion: ${result.completionTokens} | Total: ${result.promptTokens + result.completionTokens}`);
         }
         if (result.appliedFix) {
-          console.log(`   File:   ${result.appliedFix.filePath}`);
+          const files = result.appliedFix.patches.map((p) => p.filePath).join(", ");
+          console.log(`   File${result.appliedFix.patches.length === 1 ? "" : "s"}:   ${files}`);
           console.log(`   Reason: ${result.appliedFix.explanation}`);
           console.log(`   Root cause: ${result.appliedFix.rootCause}`);
         }