diffing 0.7.0 → 0.9.0

package/dist/{github-HfIlIS-J.mjs → github-oCZx5aim.mjs}

@@ -1,7 +1,60 @@
-import { execFile } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 //#region src/lib/github.ts
 const execFileAsync = promisify(execFile);
+const GH_REQUEST_TIMEOUT_MS = 45e3;
+const GH_MAX_OUTPUT_BYTES = 20 * 1024 * 1024;
+/** Execute a command with explicit stdin delivery, output limits, and timeout. */
+function execWithInput(command, args, input, timeoutMs = GH_REQUEST_TIMEOUT_MS) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(command, args, { stdio: [
+			"pipe",
+			"pipe",
+			"pipe"
+		] });
+		let stdout = "";
+		let stderr = "";
+		let settled = false;
+		const finish = (error) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			if (error) {
+				error.stdout = stdout;
+				error.stderr = stderr;
+				reject(error);
+			} else resolve({
+				stdout,
+				stderr
+			});
+		};
+		const append = (target, chunk) => {
+			const text = chunk.toString();
+			if (target === "stdout") stdout += text;
+			else stderr += text;
+			if (Buffer.byteLength(stdout) + Buffer.byteLength(stderr) > GH_MAX_OUTPUT_BYTES) {
+				child.kill("SIGTERM");
+				finish(/* @__PURE__ */ new Error("GitHub CLI response exceeded the 20 MB output limit"));
+			}
+		};
+		child.stdout.on("data", (chunk) => append("stdout", chunk));
+		child.stderr.on("data", (chunk) => append("stderr", chunk));
+		child.on("error", (error) => finish(error));
+		child.on("close", (code, signal) => {
+			if (settled) return;
+			if (code === 0) return finish();
+			const error = /* @__PURE__ */ new Error(signal ? `GitHub CLI terminated by ${signal}` : `GitHub CLI exited with code ${code ?? "unknown"}`);
+			error.code = code;
+			finish(error);
+		});
+		const timer = setTimeout(() => {
+			child.kill("SIGTERM");
+			finish(/* @__PURE__ */ new Error(`GitHub CLI request timed out after ${Math.ceil(timeoutMs / 1e3)} seconds`));
+		}, timeoutMs);
+		child.stdin.on("error", () => {});
+		child.stdin.end(input);
+	});
+}
 /**
 * Probe the `gh` CLI: is it on `$PATH`, and is the user authenticated?
 * Never throws — returns a permissive `available: false` on any failure.
@@ -141,7 +194,8 @@ async function fetchPrMetadataViaGh(resolved) {
 		login: metaJson.author.login,
 		avatarUrl: metaJson.author.avatarUrl
 	} : null;
-	const existingComments = await fetchExistingCommentsViaGh(resolved);
+	const existingReviews = await fetchExistingReviewsViaGh(resolved);
+	const existingComments = await fetchExistingCommentsViaGh(resolved, existingReviews);
 	return {
 		number: metaJson.number,
 		title: metaJson.title,
@@ -155,14 +209,12 @@ async function fetchPrMetadataViaGh(resolved) {
 		owner: resolved.owner,
 		repo: resolved.repo,
 		diff,
-		existingComments
+		existingComments,
+		existingReviews
 	};
 }
-async function fetchExistingCommentsViaGh(resolved) {
-	`${resolved.owner}${resolved.repo}`;
-	const endpoint = `repos/${resolved.owner}/${resolved.repo}/pulls/${resolved.pullNumber}/comments`;
+async function fetchExistingReviewsViaGh(resolved) {
 	const reviewsEndpoint = `repos/${resolved.owner}/${resolved.repo}/pulls/${resolved.pullNumber}/reviews`;
-	let reviews = [];
 	try {
 		const { stdout } = await execFileAsync("gh", [
 			"api",
@@ -172,11 +224,38 @@ async function fetchExistingCommentsViaGh(resolved) {
 			encoding: "utf-8",
 			maxBuffer: 20 * 1024 * 1024
 		});
-		const all = JSON.parse(stdout);
-		if (Array.isArray(all)) reviews = all;
-	} catch {}
-	reviews.sort((a, b) => a.submitted_at < b.submitted_at ? 1 : -1);
-	const recentReviews = reviews.slice(0, 50);
+		const parsed = JSON.parse(stdout);
+		if (!Array.isArray(parsed)) return [];
+		return parsed.map((review) => {
+			const state = String(review.state ?? "").toUpperCase();
+			if (![
+				"APPROVED",
+				"CHANGES_REQUESTED",
+				"COMMENTED",
+				"PENDING",
+				"DISMISSED"
+			].includes(state)) return null;
+			return {
+				id: review.id,
+				author: review.user?.login ? {
+					login: review.user.login,
+					avatarUrl: review.user.avatar_url
+				} : null,
+				body: review.body ?? "",
+				state,
+				submittedAt: review.submitted_at ?? null,
+				htmlUrl: review.html_url,
+				commitId: review.commit_id
+			};
+		}).filter((review) => review != null).sort((a, b) => (a.submittedAt ?? "") < (b.submittedAt ?? "") ? 1 : -1).slice(0, 50);
+	} catch {
+		return [];
+	}
+}
+async function fetchExistingCommentsViaGh(resolved, existingReviews) {
+	`${resolved.owner}${resolved.repo}`;
+	const endpoint = `repos/${resolved.owner}/${resolved.repo}/pulls/${resolved.pullNumber}/comments`;
+	const recentReviews = existingReviews ?? await fetchExistingReviewsViaGh(resolved);
 	const reviewStateById = /* @__PURE__ */ new Map();
 	for (const r of recentReviews) reviewStateById.set(r.id, r.state);
 	let commentsRaw = [];
@@ -194,6 +273,7 @@ async function fetchExistingCommentsViaGh(resolved) {
 	} catch {
 		return [];
 	}
+	const threadByCommentId = await fetchReviewThreadStateViaGh(resolved);
 	const byId = /* @__PURE__ */ new Map();
 	for (const c of commentsRaw) byId.set(c.id, c);
 	const replyByParent = /* @__PURE__ */ new Map();
@@ -206,6 +286,7 @@ async function fetchExistingCommentsViaGh(resolved) {
 	for (const c of commentsRaw) {
 		if (c.in_reply_to_id) continue;
 		const state = c.pull_request_review_id ? reviewStateById.get(c.pull_request_review_id) ?? null : null;
+		const thread = threadByCommentId.get(c.id);
 		tops.push({
 			id: c.id,
 			author: c.user ? {
@@ -215,7 +296,9 @@ async function fetchExistingCommentsViaGh(resolved) {
 			body: c.body ?? "",
 			path: c.path,
 			line: typeof c.line === "number" ? c.line : null,
+			startLine: typeof c.start_line === "number" ? c.start_line : null,
 			side: c.side === "LEFT" || c.side === "RIGHT" ? c.side : null,
+			startSide: c.start_side === "LEFT" || c.start_side === "RIGHT" ? c.start_side : null,
 			createdAt: c.created_at,
 			updatedAt: c.updated_at,
 			state,
@@ -227,9 +310,15 @@ async function fetchExistingCommentsViaGh(resolved) {
 				} : null,
 				body: r.body ?? "",
 				createdAt: r.created_at,
-				updatedAt: r.updated_at
+				updatedAt: r.updated_at,
+				viewerDidAuthor: threadByCommentId.get(r.id)?.viewerDidAuthor
 			})),
-			isOutdated: Boolean(c.line == null && c.original_line != null || c.position === null && c.original_position != null)
+			isOutdated: Boolean(c.line == null && c.original_line != null || c.position === null && c.original_position != null),
+			threadId: thread?.id,
+			isResolved: thread?.isResolved,
+			viewerCanResolve: thread?.viewerCanResolve,
+			viewerCanUnresolve: thread?.viewerCanUnresolve,
+			viewerDidAuthor: thread?.viewerDidAuthor
 		});
 	}
 	tops.sort((a, b) => {
@@ -238,6 +327,62 @@ async function fetchExistingCommentsViaGh(resolved) {
 	});
 	return tops;
 }
+/** Fetch thread-only state unavailable from the REST review-comments API. */
+async function fetchReviewThreadStateViaGh(resolved) {
+	const query = `
+    query ReviewThreads($owner: String!, $repo: String!, $number: Int!, $cursor: String) {
+      repository(owner: $owner, name: $repo) {
+        pullRequest(number: $number) {
+          reviewThreads(first: 100, after: $cursor) {
+            nodes {
+              id
+              isResolved
+              viewerCanResolve
+              viewerCanUnresolve
+              comments(first: 100) { nodes { databaseId viewerDidAuthor } }
+            }
+            pageInfo { hasNextPage endCursor }
+          }
+        }
+      }
+    }
+  `;
+	const byCommentId = /* @__PURE__ */ new Map();
+	let cursor = null;
+	try {
+		do {
+			const { stdout } = await execWithInput("gh", [
+				"api",
+				"graphql",
+				"--input",
+				"-"
+			], JSON.stringify({
+				query,
+				variables: {
+					owner: resolved.owner,
+					repo: resolved.repo,
+					number: resolved.pullNumber,
+					cursor
+				}
+			}));
+			const connection = JSON.parse(stdout)?.data?.repository?.pullRequest?.reviewThreads;
+			for (const node of connection?.nodes ?? []) {
+				const state = {
+					id: node.id,
+					isResolved: Boolean(node.isResolved),
+					viewerCanResolve: Boolean(node.viewerCanResolve),
+					viewerCanUnresolve: Boolean(node.viewerCanUnresolve)
+				};
+				for (const comment of node.comments?.nodes ?? []) if (typeof comment.databaseId === "number") byCommentId.set(comment.databaseId, {
+					...state,
+					viewerDidAuthor: Boolean(comment.viewerDidAuthor)
+				});
+			}
+			cursor = connection?.pageInfo?.hasNextPage ? connection.pageInfo.endCursor ?? null : null;
+		} while (cursor);
+	} catch {}
+	return byCommentId;
+}
 /**
 * POST the review to GitHub. Prefers `gh api` (uses the user's existing
 * `gh auth`); falls back to a direct HTTP call with `$GITHUB_TOKEN` when
@@ -338,11 +483,7 @@ async function submitViaGh(input) {
 		"-"
 	];
 	try {
-		const { stdout } = await execFileAsync("gh", args, {
-			encoding: "utf-8",
-			maxBuffer: 20 * 1024 * 1024,
-			input: JSON.stringify(payload)
-		});
+		const { stdout } = await execWithInput("gh", args, JSON.stringify(payload));
 		const result = JSON.parse(stdout);
 		return {
 			ok: true,
@@ -370,6 +511,7 @@ async function submitViaToken(input, token) {
 	try {
 		const res = await fetch(url, {
 			method: "POST",
+			signal: AbortSignal.timeout(GH_REQUEST_TIMEOUT_MS),
 			headers: {
 				Authorization: `Bearer ${token}`,
 				Accept: "application/vnd.github+json",
@@ -453,7 +595,7 @@ async function replyToPrComment(input) {
 		in_reply_to: input.inReplyTo
 	});
 	try {
-		const { stdout } = await execFileAsync("gh", [
+		const { stdout } = await execWithInput("gh", [
 			"api",
 			"--method",
 			"POST",
@@ -462,14 +604,26 @@ async function replyToPrComment(input) {
 			"Accept: application/vnd.github+json",
 			"--input",
 			"-"
-		], {
-			encoding: "utf-8",
-			input: payload,
-			maxBuffer: 5 * 1024 * 1024
-		});
+		], payload);
+		const result = JSON.parse(stdout);
+		if (typeof result.id !== "number") return {
+			ok: false,
+			error: "GitHub reply response did not include a comment id"
+		};
+		const now = (/* @__PURE__ */ new Date()).toISOString();
 		return {
 			ok: true,
-			id: JSON.parse(stdout).id
+			id: result.id,
+			reply: {
+				id: result.id,
+				author: result.user?.login ? {
+					login: result.user.login,
+					avatarUrl: result.user.avatar_url
+				} : null,
+				body: result.body ?? input.body,
+				createdAt: result.created_at ?? now,
+				updatedAt: result.updated_at ?? result.created_at ?? now
+			}
 		};
 	} catch (err) {
 		const msg = err?.stderr || err?.stdout || err?.message || "reply failed";
@@ -479,6 +633,91 @@ async function replyToPrComment(input) {
 		};
 	}
 }
+async function updatePrReviewComment(input) {
+	const endpoint = `repos/${input.resolved.owner}/${input.resolved.repo}/pulls/comments/${input.commentId}`;
+	try {
+		await execWithInput("gh", [
+			"api",
+			"--method",
+			"PATCH",
+			endpoint,
+			"-H",
+			"Accept: application/vnd.github+json",
+			"--input",
+			"-"
+		], JSON.stringify({ body: input.body }));
+		return { ok: true };
+	} catch (error) {
+		return {
+			ok: false,
+			error: githubCommandError(error, "Failed to edit GitHub comment")
+		};
+	}
+}
+async function deletePrReviewComment(input) {
+	const endpoint = `repos/${input.resolved.owner}/${input.resolved.repo}/pulls/comments/${input.commentId}`;
+	try {
+		await execFileAsync("gh", [
+			"api",
+			"--method",
+			"DELETE",
+			endpoint,
+			"-H",
+			"Accept: application/vnd.github+json"
+		], {
+			encoding: "utf-8",
+			timeout: GH_REQUEST_TIMEOUT_MS,
+			maxBuffer: 5 * 1024 * 1024
+		});
+		return { ok: true };
+	} catch (error) {
+		return {
+			ok: false,
+			error: githubCommandError(error, "Failed to delete GitHub comment")
+		};
+	}
+}
+async function setPrReviewThreadResolved(input) {
+	const query = `
+    mutation UpdateReviewThread($threadId: ID!) {
+      ${input.resolved ? "resolveReviewThread" : "unresolveReviewThread"}(input: { threadId: $threadId }) {
+        thread { id isResolved }
+      }
+    }
+  `;
+	try {
+		const { stdout } = await execWithInput("gh", [
+			"api",
+			"graphql",
+			"--input",
+			"-"
+		], JSON.stringify({
+			query,
+			variables: { threadId: input.threadId }
+		}));
+		const parsed = JSON.parse(stdout);
+		if (parsed.errors?.length) return {
+			ok: false,
+			error: parsed.errors.map((item) => item.message).filter(Boolean).join("; ") || "GitHub rejected the thread update"
+		};
+		return { ok: true };
+	} catch (error) {
+		return {
+			ok: false,
+			error: githubCommandError(error, "Failed to update GitHub thread")
+		};
+	}
+}
+function githubCommandError(error, fallback) {
+	const stdout = typeof error?.stdout === "string" ? error.stdout : "";
+	try {
+		const parsed = JSON.parse(stdout);
+		if (parsed.message) return parsed.message;
+		const messages = parsed.errors?.map((item) => item.message).filter(Boolean);
+		if (messages?.length) return messages.join("; ");
+	} catch {}
+	return String(error?.stderr || error?.message || fallback).trim().slice(0, 500) || fallback;
+}
 async function buildPrSession(ref) {
 	const meta = await fetchPrMetadataViaGh(parsePrRef(ref, await detectCwdRepo() ?? void 0));
 	return {
@@ -496,7 +735,8 @@ async function buildPrSession(ref) {
 		changedFiles: meta.changedFiles,
 		diff: meta.diff,
 		comments: [],
-		existingComments: meta.existingComments
+		existingComments: meta.existingComments,
+		existingReviews: meta.existingReviews
 	};
 }
 /** Refresh `diff` + `existingComments` + head SHA in an existing session. */
@@ -518,8 +758,9 @@ async function refreshPrSession(session) {
 		deletions: meta.deletions,
 		changedFiles: meta.changedFiles,
 		diff: meta.diff,
-		existingComments: meta.existingComments
+		existingComments: meta.existingComments,
+		existingReviews: meta.existingReviews
 	};
 }
 //#endregion
-export { detectGhCli as a, fetchPrMetadataViaGh as c, readGithubToken as d, refreshPrSession as f, detectCwdRepo as i, parseGhAuthStatusUser as l, submitReview as m, buildReviewPayload as n, expandMultiLineComments as o, replyToPrComment as p, decisionToEvent as r, fetchPrChecks as s, buildPrSession as t, parsePrRef as u };
+export { replyToPrComment as _, detectCwdRepo as a, updatePrReviewComment as b, expandMultiLineComments as c, fetchPrChecks as d, fetchPrMetadataViaGh as f, refreshPrSession as g, readGithubToken as h, deletePrReviewComment as i, fetchExistingCommentsViaGh as l, parsePrRef as m, buildReviewPayload as n, detectGhCli as o, parseGhAuthStatusUser as p, decisionToEvent as r, execWithInput as s, buildPrSession as t, fetchExistingReviewsViaGh as u, setPrReviewThreadResolved as v, submitReview as y };

package/dist/{mcp-eor39qmD.mjs → mcp-CqxXILYL.mjs}

@@ -1,4 +1,4 @@
-import { i as buildGitDiffArgs, o as parseDiffOptions, t as startServer } from "./server-C105rwQw.mjs";
+import { i as buildGitDiffArgs, o as parseDiffOptions, t as startServer } from "./server-CczuXSWo.mjs";
 import { t as formatComments } from "./comment-format-B5AcGcR-.mjs";
 import { n as formatPlanReview } from "./plan-format-BQyx--mp.mjs";
 import { a as removeServerLock, i as readServerLock, n as diffScopeKey, o as removeServerLockIfOwned, r as isLockAlive, s as writeServerLock, t as acquireServerStartupLease } from "./server-lock-uqSdDYeR.mjs";

package/dist/{server-C105rwQw.mjs → server-CczuXSWo.mjs}

@@ -2,7 +2,7 @@ import { C as isSafePath, S as revertHunk, _ as getUntrackedFilePathsAsync, a as
 import { a as searchContent, c as trackSelection, i as searchAll, n as saveSettings, o as searchFiles, r as getSearchStatus, s as searchSymbols, t as loadSettings } from "./settings-BVnzGFL7.mjs";
 import { t as formatComments } from "./comment-format-B5AcGcR-.mjs";
 import { n as formatPlanReview, r as sectionTitleForLine, t as extractPlanLines } from "./plan-format-BQyx--mp.mjs";
-import { f as refreshPrSession, i as detectCwdRepo, m as submitReview, t as buildPrSession, u as parsePrRef } from "./github-HfIlIS-J.mjs";
+import { a as detectCwdRepo, b as updatePrReviewComment, g as refreshPrSession, i as deletePrReviewComment, l as fetchExistingCommentsViaGh, m as parsePrRef, t as buildPrSession, u as fetchExistingReviewsViaGh, v as setPrReviewThreadResolved, y as submitReview } from "./github-oCZx5aim.mjs";
 import { execFileSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { dirname, extname, join, resolve } from "node:path";
@@ -2608,12 +2608,49 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			deletions: session.deletions,
 			changedFiles: session.changedFiles,
 			existingComments: session.existingComments,
+			existingReviews: session.existingReviews ?? [],
 			submittedAt: session.submittedAt,
 			submittedReviewId: session.submittedReviewId,
 			submittedReviewUrl: session.submittedReviewUrl,
 			authSource: session.authSource
 		});
 	});
+	const syncExistingPrReviewData = async (session) => {
+		const resolved = {
+			owner: session.owner,
+			repo: session.repo,
+			pullNumber: session.pullNumber,
+			ref: session.ref
+		};
+		let existingReviews = await fetchExistingReviewsViaGh(resolved);
+		const optimisticReview = session.submittedReviewId == null ? void 0 : session.existingReviews?.find((review) => review.id === session.submittedReviewId);
+		if (optimisticReview && !existingReviews.some((review) => review.id === optimisticReview.id) && session.submittedAt != null && Date.now() - session.submittedAt < 12e4) existingReviews = [optimisticReview, ...existingReviews];
+		const existingComments = await fetchExistingCommentsViaGh(resolved, existingReviews);
+		const comments = session.submittedAt ? (session.comments ?? []).filter((comment) => comment.createdAt > session.submittedAt) : session.comments;
+		const next = {
+			...session,
+			comments,
+			existingComments,
+			existingReviews
+		};
+		await prStore.set(next);
+		return next;
+	};
+	/** Lightweight bidirectional comment sync (without re-fetching the whole diff). */
+	app.post("/api/gh/comments/sync", async (c) => {
+		if (!prMode) return notInPrMode(c);
+		const session = await prStore.get();
+		if (!session) return notInPrMode(c);
+		try {
+			const next = await syncExistingPrReviewData(session);
+			return c.json({
+				ok: true,
+				count: next.existingComments.length
+			});
+		} catch (error) {
+			return c.json({ error: error?.message ?? "Failed to sync GitHub comments" }, 502);
+		}
+	});
 	/** Re-fetch PR metadata (head SHA, diff, existing comments) and persist. */
 	app.post("/api/gh/pr/refresh", async (c) => {
 		if (!prMode) return notInPrMode(c);
@@ -2621,7 +2658,11 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		if (!session) return notInPrMode(c);
 		try {
 			const refreshed = await refreshPrSession(session);
-			await prStore.set(refreshed);
+			const comments = refreshed.submittedAt ? (refreshed.comments ?? []).filter((comment) => comment.createdAt > refreshed.submittedAt) : refreshed.comments;
+			await prStore.set({
+				...refreshed,
+				comments
+			});
 			return c.json({
 				ok: true,
 				headSha: refreshed.headSha
@@ -2636,7 +2677,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
 		try {
-			const { fetchPrChecks } = await import("./github-C9GLNak7.mjs");
+			const { fetchPrChecks } = await import("./github-BjZZcSKV.mjs");
 			const checks = await fetchPrChecks({
 				owner: session.owner,
 				repo: session.repo,
@@ -2673,7 +2714,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		const text = typeof body.body === "string" ? body.body.trim() : "";
 		if (!text) return c.json({ error: "body is required" }, 400);
 		try {
-			const { replyToPrComment } = await import("./github-C9GLNak7.mjs");
+			const { replyToPrComment } = await import("./github-BjZZcSKV.mjs");
 			const result = await replyToPrComment({
 				resolved: {
 					owner: session.owner,
@@ -2685,16 +2726,95 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 				body: text
 			});
 			if (!result.ok) return c.json({ error: result.error ?? "Reply failed" }, 500);
-			const refreshed = await refreshPrSession(session);
-			await prStore.set(refreshed);
+			const reply = result.reply;
+			if (reply) {
+				const existingComments = session.existingComments.map((comment) => comment.id === id ? {
+					...comment,
+					replies: [...comment.replies, reply]
+				} : comment);
+				await prStore.set({
+					...session,
+					existingComments
+				});
+			}
 			return c.json({
 				ok: true,
-				id: result.id
+				id: result.id,
+				reply
 			});
 		} catch (err) {
 			return c.json({ error: err?.message ?? "Reply failed" }, 500);
 		}
 	});
+	/** Edit any published review comment or reply. */
+	app.patch("/api/gh/existing-comments/:id", async (c) => {
+		if (!prMode) return notInPrMode(c);
+		const session = await prStore.get();
+		if (!session) return notInPrMode(c);
+		const id = Number(c.req.param("id"));
+		if (!Number.isFinite(id)) return c.json({ error: "Invalid comment id" }, 400);
+		const request = await c.req.json().catch(() => ({}));
+		const text = typeof request.body === "string" ? request.body.trim() : "";
+		if (!text) return c.json({ error: "body is required" }, 400);
+		const result = await updatePrReviewComment({
+			resolved: {
+				owner: session.owner,
+				repo: session.repo,
+				pullNumber: session.pullNumber,
+				ref: session.ref
+			},
+			commentId: id,
+			body: text
+		});
+		if (!result.ok) return c.json({ error: result.error ?? "Edit failed" }, 502);
+		const next = await syncExistingPrReviewData(session);
+		return c.json({
+			ok: true,
+			existingComments: next.existingComments
+		});
+	});
+	/** Delete any published review comment or reply. */
+	app.delete("/api/gh/existing-comments/:id", async (c) => {
+		if (!prMode) return notInPrMode(c);
+		const session = await prStore.get();
+		if (!session) return notInPrMode(c);
+		const id = Number(c.req.param("id"));
+		if (!Number.isFinite(id)) return c.json({ error: "Invalid comment id" }, 400);
+		const result = await deletePrReviewComment({
+			resolved: {
+				owner: session.owner,
+				repo: session.repo,
+				pullNumber: session.pullNumber,
+				ref: session.ref
+			},
+			commentId: id
+		});
+		if (!result.ok) return c.json({ error: result.error ?? "Delete failed" }, 502);
+		const next = await syncExistingPrReviewData(session);
+		return c.json({
+			ok: true,
+			existingComments: next.existingComments
+		});
+	});
+	/** Resolve or reopen a published GitHub review thread. */
+	app.put("/api/gh/review-threads/:threadId", async (c) => {
+		if (!prMode) return notInPrMode(c);
+		const session = await prStore.get();
+		if (!session) return notInPrMode(c);
+		const threadId = c.req.param("threadId");
+		const request = await c.req.json().catch(() => ({}));
+		if (typeof request.resolved !== "boolean") return c.json({ error: "resolved must be a boolean" }, 400);
+		const result = await setPrReviewThreadResolved({
+			threadId,
+			resolved: request.resolved
+		});
+		if (!result.ok) return c.json({ error: result.error ?? "Thread update failed" }, 502);
+		const next = await syncExistingPrReviewData(session);
+		return c.json({
+			ok: true,
+			existingComments: next.existingComments
+		});
+	});
 	/** Initialize a PR session from a ref like `1234`, `o/r#42`, or a GitHub URL. */
 	app.post("/api/gh/pr/init", async (c) => {
 		if (!prMode) return notInPrMode(c);
@@ -2782,13 +2902,16 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		if (!prMode) return notInPrMode(c);
 		const id = c.req.param("id");
 		const { body, role, model } = await c.req.json();
+		const text = typeof body === "string" ? body.trim() : "";
+		if (!text) return c.json({ error: "body is required" }, 400);
 		const session = await prStore.get();
 		if (!session) return notInPrMode(c);
+		if (!(session.comments ?? []).some((cm) => cm.id === id)) return c.json({ error: "Comment not found" }, 404);
 		const comments = (session.comments ?? []).map((cm) => {
 			if (cm.id !== id) return cm;
 			const reply = {
 				id: crypto.randomUUID(),
-				body,
+				body: text,
 				createdAt: Date.now(),
 				role: role || (model ? "agent" : "user"),
 				model: model || void 0
@@ -2814,7 +2937,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 		if (decision !== "approve" && decision !== "comment" && decision !== "request-changes" && decision !== "draft") return c.json({ error: "decision must be one of: approve, comment, request-changes, draft" }, 400);
 		const generalBody = typeof body.body === "string" ? body.body : "";
 		if (body.dryRun === true) {
-			const { buildReviewPayload } = await import("./github-C9GLNak7.mjs");
+			const { buildReviewPayload } = await import("./github-BjZZcSKV.mjs");
 			const payload = buildReviewPayload({
 				decision,
 				body: generalBody,
@@ -2840,8 +2963,37 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			comments: session.comments ?? []
 		});
 		if (result.ok) {
+			let existingComments = session.existingComments;
+			let existingReviews = session.existingReviews ?? [];
+			try {
+				const resolved = {
+					owner: session.owner,
+					repo: session.repo,
+					pullNumber: session.pullNumber,
+					ref: session.ref
+				};
+				existingReviews = await fetchExistingReviewsViaGh(resolved);
+				existingComments = await fetchExistingCommentsViaGh(resolved, existingReviews);
+			} catch {}
+			if (result.reviewId != null && !existingReviews.some((review) => review.id === result.reviewId)) existingReviews = [{
+				id: result.reviewId,
+				author: null,
+				body: generalBody,
+				state: {
+					approve: "APPROVED",
+					"request-changes": "CHANGES_REQUESTED",
+					comment: "COMMENTED",
+					draft: "PENDING"
+				}[decision],
+				submittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				htmlUrl: result.reviewUrl,
+				commitId: session.headSha
+			}, ...existingReviews];
 			const next = {
 				...session,
+				comments: [],
+				existingComments,
+				existingReviews,
 				submittedAt: Date.now(),
 				submittedReviewId: result.reviewId,
 				submittedReviewUrl: result.reviewUrl,
@@ -2849,7 +3001,7 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			};
 			await prStore.set(next);
 		}
-		return c.json({
+		const responseBody = {
 			ok: result.ok,
 			reviewId: result.reviewId,
 			reviewUrl: result.reviewUrl,
@@ -2857,7 +3009,8 @@ function createApp(clientDir, diffOptsInput = DEFAULTS, commentStore, planStore,
 			authSource: result.authSource,
 			error: result.error,
 			dryRun: false
-		});
+		};
+		return result.ok ? c.json(responseBody) : c.json(responseBody, 502);
 	});
 	app.post("/api/review/send", async (c) => {
 		const body = await c.req.json().catch(() => ({}));