@g-abhishek/gitx 0.1.2 → 0.1.5

package/dist/workflows/prAddress.js

@@ -0,0 +1,349 @@
+/**
+ * PR Address Workflow
+ *
+ * Reads unresolved review comments on a PR, generates AI fixes for each one,
+ * applies them to local files, and optionally commits, pushes, and replies
+ * to each thread marking it as addressed.
+ *
+ * Used by:
+ *   - `gitx pr review <n>`  — offered interactively after the review output
+ *   - `gitx sync`           — offered when unresolved comments are detected
+ */
+import ora from "ora";
+import { select, confirm } from "@inquirer/prompts";
+import { writeFile } from "node:fs/promises";
+import { resolve as resolvePath } from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { createProvider } from "../providers/factory.js";
+import { readRepoFile } from "../utils/gitOps.js";
+import { logger } from "../logger/logger.js";
+const execFileAsync = promisify(execFile);
+async function git(args, cwd) {
+    try {
+        const result = await execFileAsync("git", args, { cwd });
+        return { stdout: result.stdout.trim(), stderr: "" };
+    }
+    catch (err) {
+        const e = err;
+        return {
+            stdout: e.stdout?.trim() ?? "",
+            stderr: (e.stderr ?? e.message ?? String(err)).trim(),
+        };
+    }
+}
+// ─── Patch application ────────────────────────────────────────────────────────
+/**
+ * Apply a line-range replacement to a file on disk.
+ * Replaces lines startLine–endLine (1-based, inclusive) with `replacement`.
+ * Returns the new file content, or throws if the line range is invalid.
+ */
+function applyLineReplacement(originalContent, startLine, endLine, replacement) {
+    const lines = originalContent.split("\n");
+    const total = lines.length;
+    if (startLine < 1 || endLine < startLine || endLine > total + 1) {
+        throw new Error(`Line range ${startLine}–${endLine} is out of bounds (file has ${total} lines)`);
+    }
+    const before = lines.slice(0, startLine - 1);
+    const after = lines.slice(endLine); // everything after endLine
+    const newLines = replacement === "" ? [] : replacement.split("\n");
+    return [...before, ...newLines, ...after].join("\n");
+}
+/**
+ * Render a human-readable before/after diff for the terminal.
+ */
+function renderLineDiff(filePath, content, startLine, endLine, replacement) {
+    const lines = content.split("\n");
+    const removed = lines.slice(startLine - 1, endLine);
+    const added = replacement === "" ? [] : replacement.split("\n");
+    const out = [`\n   📄 ${filePath}  (lines ${startLine}–${endLine})\n`];
+    for (const l of removed)
+        out.push(`   \x1b[31m- ${l}\x1b[0m`);
+    for (const l of added)
+        out.push(`   \x1b[32m+ ${l}\x1b[0m`);
+    return out.join("\n");
+}
+// ─── Comment filtering ────────────────────────────────────────────────────────
+/**
+ * Given the full flat list of PR comments, return only the root inline comments
+ * that are genuinely unresolved — i.e.:
+ *
+ *   1. They are inline (have path + line > 0).
+ *   2. They are root comments, not replies (no inReplyToId).
+ *   3. None of their replies contain "✅ Addressed" — our bot's resolution marker.
+ *
+ * This is the single source of truth used by both the address workflow and the
+ * sync pre-check. Replacing the old body-prefix heuristic which was fragile and
+ * incorrectly filtered out valid comments.
+ */
+export function filterUnresolvedInlineComments(all) {
+    // Collect IDs of root comments that already have an "✅ Addressed" reply
+    const addressedIds = new Set();
+    for (const c of all) {
+        if (c.inReplyToId && c.body.trimStart().startsWith("✅ Addressed")) {
+            addressedIds.add(c.inReplyToId);
+        }
+    }
+    return all.filter((c) => 
+    // Must be inline (file + line present)
+    !!c.path &&
+        typeof c.line === "number" &&
+        c.line > 0 &&
+        // Must be a root comment, not a reply
+        !c.inReplyToId &&
+        // Must not already be addressed by our bot
+        !addressedIds.has(c.id));
+}
+export async function runAddressWorkflow(gitx, prNumber, opts = {}) {
+    const mode = opts.mode ?? "interactive";
+    const cwd = gitx.cwd;
+    const ctx = await gitx.getRepoContext();
+    const provider = createProvider(ctx);
+    // ── 1. Fetch comments ──────────────────────────────────────────────────────
+    const fetchSpinner = ora("Fetching PR review comments…").start();
+    const allComments = await provider.getPRComments(ctx.repoSlug, prNumber);
+    // Only address root inline comments that haven't been marked "✅ Addressed" yet
+    const comments = filterUnresolvedInlineComments(allComments);
+    fetchSpinner.succeed(`Found ${comments.length} inline review comment(s) to address` +
+        (allComments.length - comments.length > 0
+            ? ` (${allComments.length - comments.length} general/bot comments skipped)`
+            : ""));
+    if (comments.length === 0) {
+        logger.info("ℹ️  No inline review comments to address.");
+        return { addressed: [], filesChanged: [], pushed: false, repliedCount: 0 };
+    }
+    // ── 2. Load file contents + diff ──────────────────────────────────────────
+    const loadSpinner = ora("Loading file context…").start();
+    const diff = await provider.getPRDiff(ctx.repoSlug, prNumber).catch(() => "");
+    // Build per-file diff sections
+    const fileDiffs = new Map();
+    let currentFile = "";
+    const diffLines = [];
+    for (const line of diff.split("\n")) {
+        const m = line.match(/^\+\+\+ b\/(.+)/);
+        if (m?.[1]) {
+            if (currentFile && diffLines.length)
+                fileDiffs.set(currentFile, diffLines.join("\n"));
+            currentFile = m[1].trim();
+            diffLines.length = 0;
+        }
+        diffLines.push(line);
+    }
+    if (currentFile && diffLines.length)
+        fileDiffs.set(currentFile, diffLines.join("\n"));
+    // Build per-file content map (deduplicated — one read per file)
+    const fileContents = new Map();
+    for (const c of comments) {
+        if (!c.path || fileContents.has(c.path))
+            continue;
+        const content = await readRepoFile(c.path, cwd);
+        if (content)
+            fileContents.set(c.path, content);
+    }
+    loadSpinner.succeed(`Loaded context for ${fileContents.size} file(s).`);
+    // ── 3. Generate + apply fixes ─────────────────────────────────────────────
+    const addressed = [];
+    const modifiedFiles = new Map(); // tracks in-memory modified content
+    for (let i = 0; i < comments.length; i++) {
+        const comment = comments[i];
+        const filePath = comment.path;
+        const line = comment.line;
+        logger.info(`\n${"─".repeat(60)}\n` +
+            `📄 [${i + 1}/${comments.length}]  ${filePath} · Line ${line}\n` +
+            `💬 ${comment.author}: ${comment.body.slice(0, 200)}${comment.body.length > 200 ? "…" : ""}\n`);
+        // Use in-memory content if file was already modified in this session
+        const currentContent = modifiedFiles.get(filePath) ?? fileContents.get(filePath) ?? "";
+        if (!currentContent) {
+            logger.warn(`   ⚠️  Could not load file content — skipping.`);
+            addressed.push({ comment, fix: makeFallbackFix(filePath, line), applied: false, skipped: true, skipReason: "file not found" });
+            continue;
+        }
+        // Generate fix
+        const fixSpinner = ora("   🤖 AI generating fix…").start();
+        let fix;
+        try {
+            fix = await gitx.ai.generateFix({
+                comment: comment.body,
+                commentAuthor: comment.author,
+                filePath,
+                line,
+                fileContent: currentContent,
+                fileDiff: fileDiffs.get(filePath) ?? "",
+            });
+            fixSpinner.succeed("   AI fix generated.");
+        }
+        catch (err) {
+            fixSpinner.fail(`   AI fix failed: ${err.message}`);
+            addressed.push({ comment, fix: makeFallbackFix(filePath, line), applied: false, skipped: true, skipReason: "AI error" });
+            continue;
+        }
+        // Discussion — no code change needed
+        if (fix.isDiscussion) {
+            logger.info(`   💬 This is a discussion comment — no code change needed.`);
+            logger.info(`   📝 ${fix.explanation}`);
+            addressed.push({ comment, fix, applied: false, skipped: true, skipReason: "discussion" });
+            continue;
+        }
+        // Show the proposed diff
+        const diffPreview = renderLineDiff(filePath, currentContent, fix.startLine, fix.endLine, fix.replacement);
+        logger.info(diffPreview);
+        logger.info(`\n   💡 ${fix.explanation}`);
+        logger.info(`   Confidence: ${fix.confidence === "high" ? "🟢 High" : "🟡 Low"}  ·  Fully resolves: ${fix.resolves ? "yes" : "partial"}`);
+        // Decide whether to apply
+        let apply = false;
+        if (mode === "auto") {
+            apply = fix.confidence === "high";
+            if (!apply)
+                logger.info("   ⏭️  Low confidence — skipping in auto mode.");
+        }
+        else if (mode === "no-push" || mode === "interactive") {
+            try {
+                apply = await confirm({ message: "   Apply this fix?", default: fix.confidence === "high" });
+            }
+            catch {
+                apply = false;
+            }
+        }
+        if (!apply) {
+            addressed.push({ comment, fix, applied: false, skipped: true, skipReason: "user skipped" });
+            continue;
+        }
+        // Apply the patch
+        try {
+            const newContent = applyLineReplacement(currentContent, fix.startLine, fix.endLine, fix.replacement);
+            const absPath = resolvePath(cwd, filePath);
+            await writeFile(absPath, newContent, "utf8");
+            modifiedFiles.set(filePath, newContent);
+            logger.info(`   ✅ Applied.`);
+            addressed.push({ comment, fix, applied: true, skipped: false });
+        }
+        catch (err) {
+            logger.warn(`   ❌ Patch failed: ${err.message}`);
+            addressed.push({ comment, fix, applied: false, skipped: true, skipReason: `patch error: ${err.message}` });
+        }
+    }
+    logger.info(`\n${"─".repeat(60)}`);
+    const appliedCount = addressed.filter((a) => a.applied).length;
+    const filesChanged = [...new Set(addressed.filter((a) => a.applied).map((a) => a.fix.file))];
+    logger.info(`\n✔ ${appliedCount} fix(es) applied across ${filesChanged.length} file(s).`);
+    if (appliedCount === 0) {
+        return { addressed, filesChanged: [], pushed: false, repliedCount: 0 };
+    }
+    // ── 4. Commit + push ──────────────────────────────────────────────────────
+    let pushed = false;
+    let commitSha;
+    const commitMsg = `fix: address PR #${prNumber} review comments (${appliedCount} fix${appliedCount !== 1 ? "es" : ""})`;
+    if (mode === "no-push") {
+        // Local changes only — no commit, no push
+        logger.info("ℹ️  Changes applied locally (--no-push mode). Review and push when ready.");
+    }
+    else if (mode === "commit-no-push") {
+        // Commit the fixes but let the caller (gitx sync) handle the push
+        // after it has rebased/merged the branch onto the base.
+        const stageSpinner = ora("Staging fix changes…").start();
+        await git(["add", ...filesChanged.map((f) => resolvePath(cwd, f))], cwd);
+        stageSpinner.succeed("Changes staged.");
+        const commitSpinner = ora("Committing fixes…").start();
+        const { stderr: commitErr } = await git(["commit", "-m", commitMsg], cwd);
+        if (commitErr && commitErr.includes("error")) {
+            commitSpinner.fail(`Commit failed: ${commitErr}`);
+        }
+        else {
+            commitSpinner.succeed(`Committed: "${commitMsg}"`);
+            const { stdout: sha } = await git(["rev-parse", "--short", "HEAD"], cwd);
+            commitSha = sha;
+        }
+        logger.info("ℹ️  Fixes committed. Sync will rebase and push everything together.");
+    }
+    else {
+        // "interactive" or "auto" — ask user then commit+push
+        let shouldPush = false;
+        if (mode === "auto") {
+            shouldPush = true;
+        }
+        else {
+            try {
+                const choice = await select({
+                    message: "What would you like to do with these changes?",
+                    choices: [
+                        { name: "Commit & push — create a commit and push to PR branch", value: "push" },
+                        { name: "Keep local only — I'll review the changes first", value: "local" },
+                        { name: "Discard all — revert every applied fix", value: "discard" },
+                    ],
+                });
+                if (choice === "discard") {
+                    await git(["checkout", "--", ...filesChanged], cwd);
+                    logger.info("↩️  All changes discarded.");
+                    return { addressed, filesChanged: [], pushed: false, repliedCount: 0 };
+                }
+                shouldPush = choice === "push";
+            }
+            catch {
+                shouldPush = false;
+            }
+        }
+        if (shouldPush) {
+            const stageSpinner = ora("Staging changes…").start();
+            await git(["add", ...filesChanged.map((f) => resolvePath(cwd, f))], cwd);
+            stageSpinner.succeed("Changes staged.");
+            const commitSpinner = ora("Committing…").start();
+            const { stderr: commitErr } = await git(["commit", "-m", commitMsg], cwd);
+            if (commitErr && commitErr.includes("error")) {
+                commitSpinner.fail(`Commit failed: ${commitErr}`);
+            }
+            else {
+                commitSpinner.succeed(`Committed: "${commitMsg}"`);
+                const { stdout: sha } = await git(["rev-parse", "--short", "HEAD"], cwd);
+                commitSha = sha;
+            }
+            const pushSpinner = ora("Pushing to remote…").start();
+            const { stderr: pushErr } = await git(["push"], cwd);
+            if (pushErr && pushErr.includes("error")) {
+                pushSpinner.fail(`Push failed: ${pushErr}`);
+            }
+            else {
+                pushSpinner.succeed("Pushed ✓");
+                pushed = true;
+            }
+        }
+        else {
+            logger.info("ℹ️  Changes kept locally. Run `git push` when ready.");
+        }
+    }
+    // ── 5. Reply to addressed comment threads ─────────────────────────────────
+    // Only reply after a real push — not in commit-no-push mode (sync will push later
+    // and the SHA we have now will change after rebase; reply happens post-push in that flow).
+    let repliedCount = 0;
+    if (pushed && commitSha) {
+        const replySpinner = ora("Replying to addressed comment threads…").start();
+        for (const entry of addressed) {
+            if (!entry.applied)
+                continue;
+            const replyBody = `✅ **Addressed** in \`${commitSha}\`\n\n${entry.fix.explanation}` +
+                (entry.fix.resolves ? "" : "\n\n> *(Partial fix — please re-review)*");
+            try {
+                await provider.replyToComment(ctx.repoSlug, prNumber, entry.comment.id, replyBody);
+                repliedCount++;
+            }
+            catch {
+                // Best-effort — don't abort if a reply fails
+            }
+        }
+        replySpinner.succeed(`Replied to ${repliedCount} thread(s).`);
+    }
+    return { addressed, filesChanged, pushed, commitSha, repliedCount };
+}
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+function makeFallbackFix(filePath, line) {
+    return {
+        file: filePath,
+        startLine: line,
+        endLine: line,
+        replacement: "",
+        explanation: "No fix generated.",
+        confidence: "low",
+        resolves: false,
+        isDiscussion: true,
+    };
+}
+//# sourceMappingURL=prAddress.js.map

package/dist/workflows/prAddress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prAddress.js","sourceRoot":"","sources":["../../src/workflows/prAddress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAY,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,KAAK,UAAU,GAAG,CAAC,IAAc,EAAE,GAAW;IAC5C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,GAA6D,CAAC;QACxE,OAAO;YACL,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;YAC9B,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;SACtD,CAAC;IACJ,CAAC;AACH,CAAC;AAqBD,iFAAiF;AAEjF;;;;GAIG;AACH,SAAS,oBAAoB,CAC3B,eAAuB,EACvB,SAAiB,EACjB,OAAe,EACf,WAAmB;IAEnB,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;IAE3B,IAAI,SAAS,GAAG,CAAC,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,cAAc,SAAS,IAAI,OAAO,+BAA+B,KAAK,SAAS,CAChF,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAW,2BAA2B;IAC1E,MAAM,QAAQ,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEnE,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CACrB,QAAgB,EAChB,OAAe,EACf,SAAiB,EACjB,OAAe,EACf,WAAmB;IAEnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,KAAK,GAAK,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,GAAG,GAAa,CAAC,WAAW,QAAQ,YAAY,SAAS,IAAI,OAAO,KAAK,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO;QAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC9D,KAAK,MAAM,CAAC,IAAI,KAAK;QAAI,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC9D,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,iFAAiF;AAEjF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,8BAA8B,CAC5C,GAAyB;IAEzB,wEAAwE;IACxE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAClE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC,MAAM,CACf,CAAC,CAAC,EAAE,EAAE;IACJ,uCAAuC;IACvC,CAAC,CAAC,CAAC,CAAC,IAAI;QACR,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC1B,CAAC,CAAC,IAAI,GAAG,CAAC;QACV,sCAAsC;QACtC,CAAC,CAAC,CAAC,WAAW;QACd,2CAA2C;QAC3C,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;AACJ,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAU,EACV,QAAgB,EAChB,OAA+B,EAAE;IAEjC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,aAAa,CAAC;IACxC,MAAM,GAAG,GAAI,IAAI,CAAC,GAAG,CAAC;IACtB,MAAM,GAAG,GAAI,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAErC,8EAA8E;IAC9E,MAAM,YAAY,GAAG,GAAG,CAAC,8BAA8B,CAAC,CAAC,KAAK,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzE,+EAA+E;IAC/E,MAAM,QAAQ,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAC7D,YAAY,CAAC,OAAO,CAClB,SAAS,QAAQ,CAAC,MAAM,sCAAsC;QAC9D,CAAC,WAAW,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC;YACvC,CAAC,CAAC,KAAK,WAAW,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,gCAAgC;YAC3E,CAAC,CAAC,EAAE,CAAC,CACR,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACzD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED,6EAA6E;IAC7E,MAAM,WAAW,GAAG,GAAG,CAAC,uBAAuB,CAAC,CAAC,KAAK,EAAE,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAE9E,+BAA+B;IAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACX,IAAI,WAAW,IAAI,SAAS,CAAC,MAAM;gBAAE,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACtF,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1B,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,WAAW,IAAI,SAAS,CAAC,MAAM;QAAE,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtF,gEAAgE;IAChE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAAE,SAAS;QAClD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAChD,IAAI,OAAO;YAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,CAAC,OAAO,CAAC,sBAAsB,YAAY,CAAC,IAAI,WAAW,CAAC,CAAC;IAExE,6EAA6E;IAC7E,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,oCAAoC;IAErF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAK,CAAC;QAC/B,MAAM,IAAI,GAAO,OAAO,CAAC,IAAK,CAAC;QAE/B,MAAM,CAAC,IAAI,CACT,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI;YACvB,OAAO,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,MAAM,QAAQ,WAAW,IAAI,IAAI;YAChE,MAAM,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAC/F,CAAC;QAEF,qEAAqE;QACrE,MAAM,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAC9D,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAC/H,SAAS;QACX,CAAC;QAED,eAAe;QACf,MAAM,UAAU,GAAG,GAAG,CAAC,0BAA0B,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3D,IAAI,GAAkB,CAAC;QACvB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC;gBAC9B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE,OAAO,CAAC,MAAM;gBAC7B,QAAQ;gBACR,IAAI;gBACJ,WAAW,EAAE,cAAc;gBAC3B,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;aACxC,CAAC,CAAC;YACH,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CAAC,IAAI,CAAC,qBAAsB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;YACzH,SAAS;QACX,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YACxC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1F,SAAS;QACX,CAAC;QAED,yBAAyB;QACzB,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1G,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,wBAAwB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QAE1I,0BAA0B;QAC1B,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,KAAK,GAAG,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK;gBAAE,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC5E,CAAC;aAAM,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YACxD,IAAI,CAAC;gBACH,KAAK,GAAG,MAAM,OAAO,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC,CAAC;YAC/F,CAAC;YAAC,MAAM,CAAC;gBACP,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;YAC5F,SAAS;QACX,CAAC;QAED,kBAAkB;QAClB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,oBAAoB,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YACrG,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC3C,MAAM,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YAC7C,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7B,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,sBAAuB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAiB,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxH,CAAC;IACH,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAC/D,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7F,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,2BAA2B,YAAY,CAAC,MAAM,WAAW,CAAC,CAAC;IAC1F,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IACzE,CAAC;IAED,6EAA6E;IAC7E,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,SAA6B,CAAC;IAElC,MAAM,SAAS,GAAG,oBAAoB,QAAQ,qBAAqB,YAAY,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IAExH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,0CAA0C;QAC1C,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC;IAE3F,CAAC;SAAM,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;QACrC,kEAAkE;QAClE,wDAAwD;QACxD,MAAM,YAAY,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,CAAC;QACzD,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACzE,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAExC,MAAM,aAAa,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1E,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC,kBAAkB,SAAS,EAAE,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,OAAO,CAAC,eAAe,SAAS,GAAG,CAAC,CAAC;YACnD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;YACzE,SAAS,GAAG,GAAG,CAAC;QAClB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;IAErF,CAAC;SAAM,CAAC;QACN,sDAAsD;QACtD,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;oBAC1B,OAAO,EAAE,+CAA+C;oBACxD,OAAO,EAAE;wBACP,EAAE,IAAI,EAAE,uDAAuD,EAAE,KAAK,EAAE,MAAM,EAAE;wBAChF,EAAE,IAAI,EAAE,iDAAiD,EAAS,KAAK,EAAE,OAAO,EAAE;wBAClF,EAAE,IAAI,EAAE,wCAAwC,EAAkB,KAAK,EAAE,SAAS,EAAE;qBACrF;iBACF,CAAC,CAAC;gBACH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzB,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;oBACpD,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;oBAC1C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;gBACzE,CAAC;gBACD,UAAU,GAAG,MAAM,KAAK,MAAM,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,GAAG,KAAK,CAAC;YACrB,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;YACrD,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACzE,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAExC,MAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC;YAC1E,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7C,aAAa,CAAC,IAAI,CAAC,kBAAkB,SAAS,EAAE,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,eAAe,SAAS,GAAG,CAAC,CAAC;gBACnD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;gBACzE,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;YAED,MAAM,WAAW,GAAG,GAAG,CAAC,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC;YACtD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;YACrD,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzC,WAAW,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,CAAC;YAChB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,kFAAkF;IAClF,2FAA2F;IAC3F,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;QACxB,MAAM,YAAY,GAAG,GAAG,CAAC,wCAAwC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3E,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,OAAO;gBAAE,SAAS;YAC7B,MAAM,SAAS,GACb,wBAAwB,SAAS,SAAS,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE;gBACjE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0CAA0C,CAAC,CAAC;YACzE,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBACnF,YAAY,EAAE,CAAC;YACjB,CAAC;YAAC,MAAM,CAAC;gBACP,6CAA6C;YAC/C,CAAC;QACH,CAAC;QACD,YAAY,CAAC,OAAO,CAAC,cAAc,YAAY,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AACtE,CAAC;AAED,iFAAiF;AAEjF,SAAS,eAAe,CAAC,QAAgB,EAAE,IAAY;IACrD,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,mBAAmB;QAChC,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,KAAK;QACf,YAAY,EAAE,IAAI;KACnB,CAAC;AACJ,CAAC","sourcesContent":["/**\n * PR Address Workflow\n *\n * Reads unresolved review comments on a PR, generates AI fixes for each one,\n * applies them to local files, and optionally commits, pushes, and replies\n * to each thread marking it as addressed.\n *\n * Used by:\n *   - `gitx pr review <n>`  — offered interactively after the review output\n *   - `gitx sync`           — offered when unresolved comments are detected\n */\n\nimport ora from \"ora\";\nimport { select, confirm } from \"@inquirer/prompts\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { resolve as resolvePath } from \"node:path\";\nimport { execFile } from \"node:child_process\";\nimport { promisify } from \"node:util\";\nimport type { Gitx } from \"../core/gitx.js\";\nimport type { PullRequestComment } from \"../providers/base.js\";\nimport type { AiFixResponse } from \"../ai/types.js\";\nimport { createProvider } from \"../providers/factory.js\";\nimport { readRepoFile } from \"../utils/gitOps.js\";\nimport { logger } from \"../logger/logger.js\";\n\nconst execFileAsync = promisify(execFile);\n\nasync function git(args: string[], cwd: string): Promise<{ stdout: string; stderr: string }> {\n  try {\n    const result = await execFileAsync(\"git\", args, { cwd });\n    return { stdout: result.stdout.trim(), stderr: \"\" };\n  } catch (err: unknown) {\n    const e = err as { stdout?: string; stderr?: string; message?: string };\n    return {\n      stdout: e.stdout?.trim() ?? \"\",\n      stderr: (e.stderr ?? e.message ?? String(err)).trim(),\n    };\n  }\n}\n\n// ─── Types ────────────────────────────────────────────────────────────────────\n\nexport interface AddressedComment {\n  comment: PullRequestComment;\n  fix: AiFixResponse;\n  applied: boolean;\n  skipped: boolean;\n  /** Reason for skipping (user choice, low-confidence rejection, patch error) */\n  skipReason?: string;\n}\n\nexport interface AddressWorkflowResult {\n  addressed: AddressedComment[];\n  filesChanged: string[];\n  pushed: boolean;\n  commitSha?: string;\n  repliedCount: number;\n}\n\n// ─── Patch application ────────────────────────────────────────────────────────\n\n/**\n * Apply a line-range replacement to a file on disk.\n * Replaces lines startLine–endLine (1-based, inclusive) with `replacement`.\n * Returns the new file content, or throws if the line range is invalid.\n */\nfunction applyLineReplacement(\n  originalContent: string,\n  startLine: number,\n  endLine: number,\n  replacement: string\n): string {\n  const lines = originalContent.split(\"\\n\");\n  const total = lines.length;\n\n  if (startLine < 1 || endLine < startLine || endLine > total + 1) {\n    throw new Error(\n      `Line range ${startLine}–${endLine} is out of bounds (file has ${total} lines)`\n    );\n  }\n\n  const before = lines.slice(0, startLine - 1);\n  const after  = lines.slice(endLine);           // everything after endLine\n  const newLines = replacement === \"\" ? [] : replacement.split(\"\\n\");\n\n  return [...before, ...newLines, ...after].join(\"\\n\");\n}\n\n/**\n * Render a human-readable before/after diff for the terminal.\n */\nfunction renderLineDiff(\n  filePath: string,\n  content: string,\n  startLine: number,\n  endLine: number,\n  replacement: string\n): string {\n  const lines = content.split(\"\\n\");\n  const removed = lines.slice(startLine - 1, endLine);\n  const added   = replacement === \"\" ? [] : replacement.split(\"\\n\");\n\n  const out: string[] = [`\\n   📄 ${filePath}  (lines ${startLine}–${endLine})\\n`];\n  for (const l of removed) out.push(`   \\x1b[31m- ${l}\\x1b[0m`);\n  for (const l of added)   out.push(`   \\x1b[32m+ ${l}\\x1b[0m`);\n  return out.join(\"\\n\");\n}\n\n// ─── Comment filtering ────────────────────────────────────────────────────────\n\n/**\n * Given the full flat list of PR comments, return only the root inline comments\n * that are genuinely unresolved — i.e.:\n *\n *   1. They are inline (have path + line > 0).\n *   2. They are root comments, not replies (no inReplyToId).\n *   3. None of their replies contain \"✅ Addressed\" — our bot's resolution marker.\n *\n * This is the single source of truth used by both the address workflow and the\n * sync pre-check. Replacing the old body-prefix heuristic which was fragile and\n * incorrectly filtered out valid comments.\n */\nexport function filterUnresolvedInlineComments(\n  all: PullRequestComment[]\n): PullRequestComment[] {\n  // Collect IDs of root comments that already have an \"✅ Addressed\" reply\n  const addressedIds = new Set<number>();\n  for (const c of all) {\n    if (c.inReplyToId && c.body.trimStart().startsWith(\"✅ Addressed\")) {\n      addressedIds.add(c.inReplyToId);\n    }\n  }\n\n  return all.filter(\n    (c) =>\n      // Must be inline (file + line present)\n      !!c.path &&\n      typeof c.line === \"number\" &&\n      c.line > 0 &&\n      // Must be a root comment, not a reply\n      !c.inReplyToId &&\n      // Must not already be addressed by our bot\n      !addressedIds.has(c.id)\n  );\n}\n\n// ─── Main workflow ────────────────────────────────────────────────────────────\n\nexport interface AddressWorkflowOptions {\n  /**\n   * \"interactive\"      (default) — show each fix and ask to apply; ask to commit+push at the end.\n   * \"auto\"             — apply all high-confidence fixes silently, commit and push.\n   * \"no-push\"          — interactive but never commits or pushes (local changes only).\n   * \"commit-no-push\"   — interactive, commits the fixes but does NOT push.\n   *                      Used by `gitx sync` so sync can push everything together\n   *                      after rebasing/merging onto the base branch.\n   */\n  mode?: \"interactive\" | \"auto\" | \"no-push\" | \"commit-no-push\";\n}\n\nexport async function runAddressWorkflow(\n  gitx: Gitx,\n  prNumber: number,\n  opts: AddressWorkflowOptions = {}\n): Promise<AddressWorkflowResult> {\n  const mode = opts.mode ?? \"interactive\";\n  const cwd  = gitx.cwd;\n  const ctx  = await gitx.getRepoContext();\n  const provider = createProvider(ctx);\n\n  // ── 1. Fetch comments ──────────────────────────────────────────────────────\n  const fetchSpinner = ora(\"Fetching PR review comments…\").start();\n  const allComments = await provider.getPRComments(ctx.repoSlug, prNumber);\n  // Only address root inline comments that haven't been marked \"✅ Addressed\" yet\n  const comments = filterUnresolvedInlineComments(allComments);\n  fetchSpinner.succeed(\n    `Found ${comments.length} inline review comment(s) to address` +\n    (allComments.length - comments.length > 0\n      ? ` (${allComments.length - comments.length} general/bot comments skipped)`\n      : \"\")\n  );\n\n  if (comments.length === 0) {\n    logger.info(\"ℹ️  No inline review comments to address.\");\n    return { addressed: [], filesChanged: [], pushed: false, repliedCount: 0 };\n  }\n\n  // ── 2. Load file contents + diff ──────────────────────────────────────────\n  const loadSpinner = ora(\"Loading file context…\").start();\n  const diff = await provider.getPRDiff(ctx.repoSlug, prNumber).catch(() => \"\");\n\n  // Build per-file diff sections\n  const fileDiffs = new Map<string, string>();\n  let currentFile = \"\";\n  const diffLines: string[] = [];\n  for (const line of diff.split(\"\\n\")) {\n    const m = line.match(/^\\+\\+\\+ b\\/(.+)/);\n    if (m?.[1]) {\n      if (currentFile && diffLines.length) fileDiffs.set(currentFile, diffLines.join(\"\\n\"));\n      currentFile = m[1].trim();\n      diffLines.length = 0;\n    }\n    diffLines.push(line);\n  }\n  if (currentFile && diffLines.length) fileDiffs.set(currentFile, diffLines.join(\"\\n\"));\n\n  // Build per-file content map (deduplicated — one read per file)\n  const fileContents = new Map<string, string>();\n  for (const c of comments) {\n    if (!c.path || fileContents.has(c.path)) continue;\n    const content = await readRepoFile(c.path, cwd);\n    if (content) fileContents.set(c.path, content);\n  }\n  loadSpinner.succeed(`Loaded context for ${fileContents.size} file(s).`);\n\n  // ── 3. Generate + apply fixes ─────────────────────────────────────────────\n  const addressed: AddressedComment[] = [];\n  const modifiedFiles = new Map<string, string>(); // tracks in-memory modified content\n\n  for (let i = 0; i < comments.length; i++) {\n    const comment = comments[i]!;\n    const filePath = comment.path!;\n    const line     = comment.line!;\n\n    logger.info(\n      `\\n${\"─\".repeat(60)}\\n` +\n      `📄 [${i + 1}/${comments.length}]  ${filePath} · Line ${line}\\n` +\n      `💬 ${comment.author}: ${comment.body.slice(0, 200)}${comment.body.length > 200 ? \"…\" : \"\"}\\n`\n    );\n\n    // Use in-memory content if file was already modified in this session\n    const currentContent = modifiedFiles.get(filePath) ?? fileContents.get(filePath) ?? \"\";\n    if (!currentContent) {\n      logger.warn(`   ⚠️  Could not load file content — skipping.`);\n      addressed.push({ comment, fix: makeFallbackFix(filePath, line), applied: false, skipped: true, skipReason: \"file not found\" });\n      continue;\n    }\n\n    // Generate fix\n    const fixSpinner = ora(\"   🤖 AI generating fix…\").start();\n    let fix: AiFixResponse;\n    try {\n      fix = await gitx.ai.generateFix({\n        comment: comment.body,\n        commentAuthor: comment.author,\n        filePath,\n        line,\n        fileContent: currentContent,\n        fileDiff: fileDiffs.get(filePath) ?? \"\",\n      });\n      fixSpinner.succeed(\"   AI fix generated.\");\n    } catch (err) {\n      fixSpinner.fail(`   AI fix failed: ${(err as Error).message}`);\n      addressed.push({ comment, fix: makeFallbackFix(filePath, line), applied: false, skipped: true, skipReason: \"AI error\" });\n      continue;\n    }\n\n    // Discussion — no code change needed\n    if (fix.isDiscussion) {\n      logger.info(`   💬 This is a discussion comment — no code change needed.`);\n      logger.info(`   📝 ${fix.explanation}`);\n      addressed.push({ comment, fix, applied: false, skipped: true, skipReason: \"discussion\" });\n      continue;\n    }\n\n    // Show the proposed diff\n    const diffPreview = renderLineDiff(filePath, currentContent, fix.startLine, fix.endLine, fix.replacement);\n    logger.info(diffPreview);\n    logger.info(`\\n   💡 ${fix.explanation}`);\n    logger.info(`   Confidence: ${fix.confidence === \"high\" ? \"🟢 High\" : \"🟡 Low\"}  ·  Fully resolves: ${fix.resolves ? \"yes\" : \"partial\"}`);\n\n    // Decide whether to apply\n    let apply = false;\n\n    if (mode === \"auto\") {\n      apply = fix.confidence === \"high\";\n      if (!apply) logger.info(\"   ⏭️  Low confidence — skipping in auto mode.\");\n    } else if (mode === \"no-push\" || mode === \"interactive\") {\n      try {\n        apply = await confirm({ message: \"   Apply this fix?\", default: fix.confidence === \"high\" });\n      } catch {\n        apply = false;\n      }\n    }\n\n    if (!apply) {\n      addressed.push({ comment, fix, applied: false, skipped: true, skipReason: \"user skipped\" });\n      continue;\n    }\n\n    // Apply the patch\n    try {\n      const newContent = applyLineReplacement(currentContent, fix.startLine, fix.endLine, fix.replacement);\n      const absPath = resolvePath(cwd, filePath);\n      await writeFile(absPath, newContent, \"utf8\");\n      modifiedFiles.set(filePath, newContent);\n      logger.info(`   ✅ Applied.`);\n      addressed.push({ comment, fix, applied: true, skipped: false });\n    } catch (err) {\n      logger.warn(`   ❌ Patch failed: ${(err as Error).message}`);\n      addressed.push({ comment, fix, applied: false, skipped: true, skipReason: `patch error: ${(err as Error).message}` });\n    }\n  }\n\n  logger.info(`\\n${\"─\".repeat(60)}`);\n\n  const appliedCount = addressed.filter((a) => a.applied).length;\n  const filesChanged = [...new Set(addressed.filter((a) => a.applied).map((a) => a.fix.file))];\n\n  logger.info(`\\n✔ ${appliedCount} fix(es) applied across ${filesChanged.length} file(s).`);\n  if (appliedCount === 0) {\n    return { addressed, filesChanged: [], pushed: false, repliedCount: 0 };\n  }\n\n  // ── 4. Commit + push ──────────────────────────────────────────────────────\n  let pushed = false;\n  let commitSha: string | undefined;\n\n  const commitMsg = `fix: address PR #${prNumber} review comments (${appliedCount} fix${appliedCount !== 1 ? \"es\" : \"\"})`;\n\n  if (mode === \"no-push\") {\n    // Local changes only — no commit, no push\n    logger.info(\"ℹ️  Changes applied locally (--no-push mode). Review and push when ready.\");\n\n  } else if (mode === \"commit-no-push\") {\n    // Commit the fixes but let the caller (gitx sync) handle the push\n    // after it has rebased/merged the branch onto the base.\n    const stageSpinner = ora(\"Staging fix changes…\").start();\n    await git([\"add\", ...filesChanged.map((f) => resolvePath(cwd, f))], cwd);\n    stageSpinner.succeed(\"Changes staged.\");\n\n    const commitSpinner = ora(\"Committing fixes…\").start();\n    const { stderr: commitErr } = await git([\"commit\", \"-m\", commitMsg], cwd);\n    if (commitErr && commitErr.includes(\"error\")) {\n      commitSpinner.fail(`Commit failed: ${commitErr}`);\n    } else {\n      commitSpinner.succeed(`Committed: \"${commitMsg}\"`);\n      const { stdout: sha } = await git([\"rev-parse\", \"--short\", \"HEAD\"], cwd);\n      commitSha = sha;\n    }\n    logger.info(\"ℹ️  Fixes committed. Sync will rebase and push everything together.\");\n\n  } else {\n    // \"interactive\" or \"auto\" — ask user then commit+push\n    let shouldPush = false;\n    if (mode === \"auto\") {\n      shouldPush = true;\n    } else {\n      try {\n        const choice = await select({\n          message: \"What would you like to do with these changes?\",\n          choices: [\n            { name: \"Commit & push — create a commit and push to PR branch\", value: \"push\" },\n            { name: \"Keep local only — I'll review the changes first\",        value: \"local\" },\n            { name: \"Discard all — revert every applied fix\",                 value: \"discard\" },\n          ],\n        });\n        if (choice === \"discard\") {\n          await git([\"checkout\", \"--\", ...filesChanged], cwd);\n          logger.info(\"↩️  All changes discarded.\");\n          return { addressed, filesChanged: [], pushed: false, repliedCount: 0 };\n        }\n        shouldPush = choice === \"push\";\n      } catch {\n        shouldPush = false;\n      }\n    }\n\n    if (shouldPush) {\n      const stageSpinner = ora(\"Staging changes…\").start();\n      await git([\"add\", ...filesChanged.map((f) => resolvePath(cwd, f))], cwd);\n      stageSpinner.succeed(\"Changes staged.\");\n\n      const commitSpinner = ora(\"Committing…\").start();\n      const { stderr: commitErr } = await git([\"commit\", \"-m\", commitMsg], cwd);\n      if (commitErr && commitErr.includes(\"error\")) {\n        commitSpinner.fail(`Commit failed: ${commitErr}`);\n      } else {\n        commitSpinner.succeed(`Committed: \"${commitMsg}\"`);\n        const { stdout: sha } = await git([\"rev-parse\", \"--short\", \"HEAD\"], cwd);\n        commitSha = sha;\n      }\n\n      const pushSpinner = ora(\"Pushing to remote…\").start();\n      const { stderr: pushErr } = await git([\"push\"], cwd);\n      if (pushErr && pushErr.includes(\"error\")) {\n        pushSpinner.fail(`Push failed: ${pushErr}`);\n      } else {\n        pushSpinner.succeed(\"Pushed ✓\");\n        pushed = true;\n      }\n    } else {\n      logger.info(\"ℹ️  Changes kept locally. Run `git push` when ready.\");\n    }\n  }\n\n  // ── 5. Reply to addressed comment threads ─────────────────────────────────\n  // Only reply after a real push — not in commit-no-push mode (sync will push later\n  // and the SHA we have now will change after rebase; reply happens post-push in that flow).\n  let repliedCount = 0;\n  if (pushed && commitSha) {\n    const replySpinner = ora(\"Replying to addressed comment threads…\").start();\n    for (const entry of addressed) {\n      if (!entry.applied) continue;\n      const replyBody =\n        `✅ **Addressed** in \\`${commitSha}\\`\\n\\n${entry.fix.explanation}` +\n        (entry.fix.resolves ? \"\" : \"\\n\\n> *(Partial fix — please re-review)*\");\n      try {\n        await provider.replyToComment(ctx.repoSlug, prNumber, entry.comment.id, replyBody);\n        repliedCount++;\n      } catch {\n        // Best-effort — don't abort if a reply fails\n      }\n    }\n    replySpinner.succeed(`Replied to ${repliedCount} thread(s).`);\n  }\n\n  return { addressed, filesChanged, pushed, commitSha, repliedCount };\n}\n\n// ─── Helpers ──────────────────────────────────────────────────────────────────\n\nfunction makeFallbackFix(filePath: string, line: number): AiFixResponse {\n  return {\n    file: filePath,\n    startLine: line,\n    endLine: line,\n    replacement: \"\",\n    explanation: \"No fix generated.\",\n    confidence: \"low\",\n    resolves: false,\n    isDiscussion: true,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@g-abhishek/gitx",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "AI-powered Git workflow automation CLI and SDK",
   "type": "module",
   "license": "MIT",