prreviewbuddy 0.75.0 → 0.77.1

package/dist/server.js

@@ -1,4 +1,4 @@
-import { $ as MAX_WORKSPACE_PORT, $n as decideKissRecommendation, $r as findingIn, $t as markReadForReview, A as relativeTime$1, Ai as AgentCancelledError, Ar as sectionOf, At as partFiles, B as readIndexToken, Bn as allJobs, Br as questionsOutstanding, Bt as isArchitectureId, C as track, Ci as writeAgentPreference, Cn as MANAGED_ROOT, Cr as activityLabel, Ct as mapRuntimes, D as endRun, Di as agentById, Dn as readMarker, Dr as lifecyclePill, Dt as ARCHITECTURE_DIR, E as completeRun, Ei as AGENT_IDS, En as isWorktreeHeld, Er as lifecycleItemLabel, Et as describeRuntimes, F as runBatch, Fn as followedBranch, Fr as readQueue, Ft as trackedFiles, Gn as saveJob, Gr as explanationOf, Gt as categoryOf, H as clearServerRecordOwnedBy, Hn as fail, Hr as processDiscussion, Ht as announceJob, I as activateQueued, In as reviewedShaOf, Ir as doneVerb, It as ownersOf, J as stopChild, Jn as phasesFor, Jr as ANALYSIS_ONLY, Jt as createPrUpdate, K as serverEntryExists, Kr as isExplanationAction, Kt as createArchitectureNotification, L as compactQueue, Ln as fetchHead, Lr as isIssueOutstanding, Lt as QUOTE_LIMITS, M as extractPullRequestLinks, Mn as findExistingReview, Mr as queueAddMany, Mt as repositoryKey, N as parsePullRequestLink, Nn as checkCodeFreshness, Nr as queueRemove, Nt as storeArchitecture, O as reportRun, Oi as agentFor$1, On as removeWorktree, Or as offersLifecycle, Ot as checkArchitecture, P as unsupportedReason, Pn as checkReview, Pr as queueStamp, Pt as storedScopes, Q as DEFAULT_WORKSPACE_PORT, Qn as isClaimed, Qr as findingAssessment, Qt as markRead, Rn as forgeResolver, Rr as isQuestionOutstanding, Rt as REPOSITORY_SCOPE, S as isDriving, Si as readAgentPreference, Sn as ReviewBeingDeletedError, Sr as activityAttributes, St as waitingHistory, T as beginRun, Ti as STORE_ROOT, Tn as holdWorktree, Tr as lifecycleChip, Tt as RUNTIME_WORDS, Un as isTerminal, Ur as recommendationsOf, Ut as branchOf, Vn as endedAt, Vr as reviewerDispositions, Vt as writeJsonAtomically, W as readServerRecord, Wn as loadJob, Wr as explanationActionOf, Wt as subjectOf, Xn as purposeOf, Xr as assessmentLookup, Xt as listNotifications, Yn as progressSteps, Yr as analysisRefOf, Yt as eventName, Z as writeServerRecord, Zr as currentGradeIn, Zt as markAllRead, _ as liveUpdateFor, _i as resolveBase, _n as CODE_BLOCK_CLASS, _t as telemetryUploadConsent, a as wasBlocked, ai as wasReassessed, an as retireNotification, ar as kissDecisionsOf, at as failureOf$1, bi as resolveModel, bn as renderInlineText, br as workspaceStamps, c as RefreshUnavailableError, ci as extractJsonText, cn as unreadCount$1, cr as loadWorkspace, ct as reanalyseReview, d as mergeUpdateInto, di as WITHHELD_REASON, dn as EXPLAIN_SIMPLY_PROMPT, ei as gradeScale, en as moveIds, er as followedRefName, et as MIN_WORKSPACE_PORT, f as updateReview, fi as kissOutcome, fn as UNESTABLISHED_MOTIVATION, fr as presentedKissRunOf, ft as readEvents, g as UpdateAlreadyRunningError, gi as isCommitReview, gn as renderMarkdown, gt as recordTelemetryUploadConsent, h as askCheckout, hi as DetachedHeadError, hn as GITHUB_MARKDOWN, hr as reviewedCommit, i as liveJobsFor, ii as sourcePhrase, in as removeNotification, ir as kissDecisionRefusal, it as writePortPreference, j as batchIdentity, ji as AgentUnavailableError, jr as queueAdd, jt as readArchitecture, k as stopRun, ki as detectAgents, kn as requestJobStop, kr as parseLifecycle, kt as loadArchitecture, l as cancelUpdate, li as objectWithAnyOf, ln as withUsageRecorded, lt as runJob, m as isUnchanged, mi as originRemote, mn as hasAuthorContent, mr as recentWorkspaces, n as deleteReview, ni as promptGrade, nn as readNotification, nr as indexKeptIds, nt as resolveWorkspacePort, o as discardJob, oi as followUpFindingId, on as toneOf, or as latestKissRun, ot as prepareReview, p as refreshPrContext, pi as resolveTarget, pn as authorPreview, pr as previousKissResult, pt as record, q as spawnServer, qn as isLiveJob, qr as withExplanation, qt as createPrState, r as lineageIds, ri as reassessIn, rn as readStateOf, rr as indexReviewGroups, rt as statedWorkspacePort, s as FETCH_TIMEOUT_MS, si as asString, sn as unreadAround, sr as lineagePosition, st as settleReview, t as deleteLineage, ti as isGradeFor, tn as pruneNotifications, tr as groupByLineage, tt as parseWorkspacePort, u as cancellableHere, ui as describeAuthorship, un as existingPaths, ur as mutateWorkspace, vi as git, vn as CODE_COPY_CLASS, vr as touchWorkspace, w as RUN_KINDS, wn as createWorktree, wr as isLifecycle, wt as recordRuntimeBestEffort, x as startKissJob, xi as clearAgentPreference, xr as LIFECYCLES, xt as feedbackUrl, y as agentEnvOf, yi as resolveAgent, yn as escapeHtml$1, yr as workspaceRevision, yt as BUILD_VERSION, z as settleQueue, zn as fillFileUrlTemplate, zr as issuesOutstanding, zt as ancestorsOf } from "./delete_review-BWKGCqwI.js";
+import { $ as resolveWorkspacePort, $n as saveJob, $r as explanationActionOf, $t as pruneNotifications, A as parsePullRequestLink, Ai as git, An as ReviewBeingDeletedError, Ar as activityAttributes, At as repositoryKey, Bi as agentById, Bn as findExistingReview, Br as queueAddMany, Bt as announceJob, C as completeRun, Ci as originRemote, Cn as GITHUB_MARKDOWN, Cr as reviewedCommit, Ct as RUNTIME_WORDS, D as relativeTime$1, Di as AmbiguousRefError, Dn as escapeHtml$1, Dr as workspaceRevision, Dt as loadArchitecture, E as stopRun, Ei as resolveBase, En as CODE_COPY_CLASS, Er as touchWorkspace, Et as checkArchitecture, Fi as readAgentPreference, Fn as readMarker, Fr as lifecyclePill, Ft as QUOTE_LIMITS, G as stopChild, Gn as fetchHead, Gr as isIssueOutstanding, Gt as createPrState, Hi as detectAgents, Hn as checkReview, Hr as queueStamp, Ht as subjectOf, I as settleQueue, Ii as writeAgentPreference, In as removeWorktree, Ir as offersLifecycle, It as REPOSITORY_SCOPE, J as writeServerRecord, Jn as allJobs, Jr as questionsOutstanding, Jt as listNotifications, Kn as forgeResolver, Kr as isQuestionOutstanding, Kt as createPrUpdate, L as readIndexToken, Ln as requestJobStop, Lr as parseLifecycle, Lt as ancestorsOf, M as runBatch, Mi as resolveAgent, Mn as createWorktree, Mr as isLifecycle, Mt as storedScopes, N as activateQueued, Ni as resolveModel, Nn as holdWorktree, Nr as lifecycleChip, Nt as trackedFiles, O as batchIdentity, Oi as shortNameOf, On as renderInlineText, Or as workspaceStamps, Ot as partFiles, P as compactQueue, Pi as clearAgentPreference, Pn as isWorktreeHeld, Pr as lifecycleItemLabel, Pt as ownersOf, Q as parseWorkspacePort, Qn as loadJob, Qr as recommendationsOf, Qt as moveIds, Ri as STORE_ROOT, Rr as sectionOf, Rt as isArchitectureId, S as beginRun, Si as resolveTarget, Sn as hasAuthorContent, Sr as recentWorkspaces, St as recordRuntimeBestEffort, T as reportRun, Ti as isCommitReview, Tn as CODE_BLOCK_CLASS, Tt as ARCHITECTURE_DIR, U as serverEntryExists, Ui as AgentCancelledError, Un as followedBranch, Ur as readQueue, Ut as categoryOf, V as readServerRecord, Vi as agentFor$1, Vn as checkCodeFreshness, Vr as queueRemove, Vt as branchOf, W as spawnServer, Wi as AgentUnavailableError, Wn as reviewedShaOf, Wr as doneVerb, Wt as createArchitectureNotification, X as MAX_WORKSPACE_PORT, Xn as fail$1, Xr as reviewerDispositions, Xt as markRead, Y as DEFAULT_WORKSPACE_PORT, Yn as endedAt, Yr as resolvedByConversation, Yt as markAllRead, Z as MIN_WORKSPACE_PORT, Zn as isTerminal, Zr as processDiscussion, Zt as markReadForReview, _i as extractJsonText, _n as agentEnvOf, _t as BUILD_VERSION, a as wasBlocked, ai as assessmentLookup, an as unreadAround, at as settleReview, b as track, bi as WITHHELD_REASON, bn as UNESTABLISHED_MOTIVATION, br as presentedKissRunOf, bt as waitingHistory, c as RefreshUnavailableError, ci as findingIn, cn as existingPaths, cr as followedRefName, d as mergeUpdateInto, di as promptGrade, dn as prepareConversationWithin, dr as indexReviewGroups, dt as record, ei as explanationOf, en as readNotification, et as statedWorkspacePort, f as updateReview, fi as reassessIn, fn as saveRefresh, fr as kissDecisionRefusal, gi as asString, gn as isUnchanged, gr as loadWorkspace, h as liveUpdateFor, hi as followUpFindingId, hn as refreshPrContext, hr as lineagePosition, ht as telemetryUploadConsent, i as liveJobsFor, ii as analysisRefOf, in as toneOf, ir as purposeOf, it as prepareReview, j as unsupportedReason, ji as refExists, jn as MANAGED_ROOT, jr as activityLabel, jt as storeArchitecture, k as extractPullRequestLinks, ki as shorthandOf, kr as LIFECYCLES, kt as readArchitecture, l as cancelUpdate, li as gradeScale, ln as ASK_REREAD_CEILING_MS, lr as groupByLineage, m as UpdateAlreadyRunningError, mi as wasReassessed, mn as unforeseenFailure, mr as latestKissRun, mt as recordTelemetryUploadConsent, n as deleteReview, ni as withExplanation, nn as removeNotification, nr as phasesFor, nt as failureOf$1, o as discardJob, oi as currentGradeIn, on as unreadCount$1, or as isClaimed, ot as reanalyseReview, p as askCheckout, pi as sourcePhrase, pn as storedConversation, pr as kissDecisionsOf, qn as fillFileUrlTemplate, qr as issuesOutstanding, qt as eventName, r as lineageIds, ri as ANALYSIS_ONLY, rn as retireNotification, rr as progressSteps, rt as observeReview, s as FETCH_TIMEOUT_MS, si as findingAssessment, sn as withUsageRecorded, sr as decideKissRecommendation, st as runJob, t as deleteLineage, ti as isExplanationAction, tn as readStateOf, tr as isLiveJob, tt as writePortPreference, u as cancellableHere, ui as isGradeFor, un as adoptLegacyBaseline, ur as indexKeptIds, ut as readEvents, v as startKissJob, vi as objectWithAnyOf, vn as EXPLAIN_SIMPLY_PROMPT, vr as mutateWorkspace, w as endRun, wi as DetachedHeadError, wn as renderMarkdown, wt as describeRuntimes, x as RUN_KINDS, xi as kissOutcome, xn as authorPreview, xr as previousKissResult, xt as mapRuntimes, y as isDriving, yi as describeAuthorship, yn as chatConversationSection, yt as feedbackUrl, z as clearServerRecordOwnedBy, zi as AGENT_IDS, zr as queueAdd, zt as writeJsonAtomically } from "./delete_review-BHOzMQ0_.js";
 import { basename, isAbsolute, join, relative, resolve } from "node:path";
 import { execFile } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
@@ -1210,13 +1210,43 @@ function importanceTip(importance) {
 * tell those apart from the badge — so the copy commits to the weaker of the two readings rather
 * than claiming a judgement that may not have been made.
 */
-function findingStatusTip(status) {
+function findingStatusTip(status, against = "commits") {
 	return {
-		resolved: "Resolved — the new commits appear to address this finding. Worth a glance to confirm before you close it out.",
-		"still-open": "Still open — the new commits do not address this finding. Findings the analysis did not comment on are shown this way too, so this never disappears on its own.",
-		affected: "Affected — the code this finding concerns has changed, but not in a way that settles it. Re-read this one.",
-		new: "New — introduced by the changes pushed since your previous analysis."
-	}[status];
+		commits: {
+			resolved: "Resolved — the new commits appear to address this finding. Worth a glance to confirm before you close it out.",
+			"still-open": "Still open — the new commits do not address this finding. Findings the analysis did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — the code this finding concerns has changed, but not in a way that settles it. Re-read this one.",
+			new: "New — introduced by the changes pushed since your previous analysis."
+		},
+		conversation: {
+			resolved: "Resolved — a comment on the pull request shows this finding no longer applies. Worth a glance to confirm before you close it out.",
+			"still-open": "Still open — nothing said on the pull request settles this finding. Findings the analysis did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — something said on the pull request bears on this finding without settling it. Re-read this one.",
+			new: "New — raised in the pull request conversation since your previous analysis, and confirmed in the code."
+		},
+		"commits-and-conversation": {
+			resolved: "Resolved — the new commits or the pull request conversation appear to settle this finding. Worth a glance to confirm before you close it out.",
+			"still-open": "Still open — neither the new commits nor the pull request conversation settle this finding. Findings the analysis did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — the new commits or the pull request conversation bear on this finding without settling it. Re-read this one.",
+			new: "New — found in the commits or the conversation since your previous analysis."
+		}
+	}[against][status];
+}
+/** What an update's note on a finding came after, as Copy heads it. */
+function reconciledAfter(against = "commits") {
+	return {
+		commits: "After the new commits",
+		conversation: "After the pull request conversation",
+		"commits-and-conversation": "After the new commits and comments"
+	}[against];
+}
+/** Where an update's answer to a question came from, as its heading. */
+function reconciledAnswerHeading(against = "commits") {
+	return {
+		commits: "Answered by the new changes",
+		conversation: "Answered by the pull request conversation",
+		"commits-and-conversation": "Answered by the new changes or comments"
+	}[against];
 }
 /** The reviewer-facing label for a status. Kept beside the tooltips so the two cannot drift. */
 function findingStatusLabel(status) {
@@ -1234,12 +1264,24 @@ function findingStatusLabel(status) {
 * for a question the reassessment never mentioned. The copy commits to the weaker reading, because
 * the reviewer must not read silence as an answer.
 */
-function questionStatusTip(status) {
+function questionStatusTip(status, against = "commits") {
 	return {
-		answered: "Answered — the new commits settle this, and the answer is below. Worth a glance to confirm before you drop it.",
-		"still-open": "Still open — the new commits do not settle this. Questions the reassessment did not comment on are shown this way too, so this never disappears on its own.",
-		affected: "Affected — the code this question is about has changed without answering it. Read the question again before you ask it."
-	}[status];
+		commits: {
+			answered: "Answered — the new commits settle this, and the answer is below. Worth a glance to confirm before you drop it.",
+			"still-open": "Still open — the new commits do not settle this. Questions the reassessment did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — the code this question is about has changed without answering it. Read the question again before you ask it."
+		},
+		conversation: {
+			answered: "Answered — the pull request conversation settles this, and the answer is below. Worth a glance to confirm before you drop it.",
+			"still-open": "Still open — nothing said on the pull request settles this. Questions the reassessment did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — something said on the pull request bears on this question without answering it. Read the question again before you ask it."
+		},
+		"commits-and-conversation": {
+			answered: "Answered — the new commits or the pull request conversation settle this, and the answer is below. Worth a glance to confirm before you drop it.",
+			"still-open": "Still open — neither the new commits nor the pull request conversation settle this. Questions the reassessment did not comment on are shown this way too, so this never disappears on its own.",
+			affected: "Affected — the new commits or the pull request conversation bear on this question without answering it. Read the question again before you ask it."
+		}
+	}[against][status];
 }
 /** The reviewer-facing label for a question status. Kept beside the tooltip so the two cannot drift. */
 function questionStatusLabel(status) {
@@ -1301,6 +1343,102 @@ function pillAttrs(classNames, tip) {
 	return ` class="${escapeHtml$1(classNames)} pr-helper-tip" data-tip="${escapeHtml$1(tip)}"`;
 }
 //#endregion
+//#region ../../packages/review-harness/src/domain/utils/relative_time.ts
+function formatRelativeTime(ts, now = Date.now()) {
+	const diffMs = Math.max(0, now - ts);
+	const minute = 6e4;
+	const hour = 60 * minute;
+	const day = 24 * hour;
+	if (diffMs < minute) return "Just now";
+	if (diffMs < hour) {
+		const mins = Math.floor(diffMs / minute);
+		return `${mins} min${mins === 1 ? "" : "s"} ago`;
+	}
+	if (diffMs < day) {
+		const hours = Math.floor(diffMs / hour);
+		return `${hours} hour${hours === 1 ? "" : "s"} ago`;
+	}
+	const days = Math.floor(diffMs / day);
+	return `${days} day${days === 1 ? "" : "s"} ago`;
+}
+//#endregion
+//#region ../../packages/review-harness/src/domain/ui/components/status_history.ts
+/**
+* What a step did, by where it came from. A settled finding's three outcomes are kept apart
+* because they are different statements: reopened says the finding is valid again, marked for
+* reassessment says nobody could tell, and still resolved says the resolution survived.
+*/
+function statusStepHeadline(from, step) {
+	if (step.carried) return `${findingStatusLabel(step.status)}, before history was kept`;
+	if (from === "resolved") {
+		if (step.status === "still-open") return "Reopened";
+		if (step.status === "affected") return "Marked for reassessment";
+		if (step.status === "resolved") return "Still resolved";
+	}
+	return findingStatusLabel(step.status);
+}
+/** Who or what decided a step. */
+function statusBasisPhrase(step) {
+	switch (step.basis) {
+		case "code": return step.commitSha ? `by the new commits, at ${step.commitSha.slice(0, 7)}` : "by the new commits";
+		case "conversation": return "by the pull request conversation";
+		case "manual": return "by you";
+		default: return "";
+	}
+}
+/** Why a settled finding was looked at again, when that is why. */
+function statusTriggerSentence(step) {
+	if (step.trigger === "evidence-edited") return "The comment it was resolved by was edited.";
+	if (step.trigger === "evidence-deleted") return "The comment it was resolved by was deleted.";
+	return "";
+}
+/** Whose words these are, and what they were. */
+function evidenceAttribution(evidence) {
+	const what = evidence.kind === "review" ? "review" : "comment";
+	if (evidence.deleted) return `@${evidence.author}'s ${what}, since deleted`;
+	return `@${evidence.author}'s ${what}, as it read then`;
+}
+/** The steps paired with the status each moved from: the previous step's, or none for the first. */
+function statusSteps(history) {
+	return history.map((step, index) => ({
+		from: index > 0 ? history[index - 1].status : void 0,
+		step
+	}));
+}
+/** Whether there is a history worth showing: at least one change recorded, not only a carried start. */
+function hasStatusHistory(history) {
+	return !!history?.some((step) => !step.carried);
+}
+function renderEvidence$2(evidence, now) {
+	if (!evidence) return "";
+	const edited = evidence.editedAt && Number.isFinite(Date.parse(evidence.editedAt)) ? ` · edited ${escapeHtml$1(formatRelativeTime(Date.parse(evidence.editedAt), now))}` : "";
+	const body = evidence.body ? `<p class="pr-helper-status-evidence-body">${renderInlineText(evidence.body)}</p>` : "";
+	const link = evidence.url && /^https?:\/\//i.test(evidence.url) ? `<a class="pr-helper-status-evidence-link" href="${escapeHtml$1(evidence.url)}" target="_blank" rel="noopener noreferrer">Open the ${evidence.kind === "review" ? "review" : "comment"}</a>` : "";
+	return `<blockquote class="pr-helper-status-evidence" data-status-evidence>
+          <p class="pr-helper-status-evidence-who">${escapeHtml$1(evidenceAttribution(evidence))}${edited}</p>
+          ${body}${link}
+        </blockquote>`;
+}
+function renderStep$1(from, step, now) {
+	const source = [statusBasisPhrase(step), step.at !== void 0 ? formatRelativeTime(step.at, now) : ""].filter(Boolean).join(" · ");
+	const trigger = statusTriggerSentence(step);
+	return `<li class="pr-helper-reassessment-step" data-status-step="${escapeHtml$1(step.status)}">
+        <span class="pr-helper-reassessment-step-move pr-helper-status-step-headline">${escapeHtml$1(statusStepHeadline(from, step))}</span>
+        ${source ? `<span class="pr-helper-reassessment-step-source">${escapeHtml$1(source)}</span>` : ""}
+        ${trigger ? `<p class="pr-helper-reassessment-reason">${escapeHtml$1(trigger)}</p>` : ""}
+        ${step.reason ? `<p class="pr-helper-reassessment-reason">${renderInlineText(step.reason)}</p>` : ""}
+        ${renderEvidence$2(step.evidence, now)}
+      </li>`;
+}
+/** The disclosure, closed. Nothing when the status has never changed. */
+function renderStatusHistory(history, now = Date.now()) {
+	if (!hasStatusHistory(history)) return "";
+	return `<details class="pr-helper-reassessment-history pr-helper-status-history" data-status-history>
+      <summary class="pr-helper-reassessment-history-summary">Status history</summary>
+      <ol class="pr-helper-reassessment-steps">${statusSteps(history).map(({ from, step }) => renderStep$1(from, step, now)).join("")}</ol>
+    </details>`;
+}
+//#endregion
 //#region ../../packages/review-harness/src/domain/ui/components/finding_copy.ts
 /**
 * An issue's Copy: its title in bold, the description, the update, the investigation, how its grade
@@ -1325,8 +1463,12 @@ function issueText(issue, investigation, assessment) {
 	return join$1([
 		bold(issue.title),
 		issue.description,
-		update(issue.reconciliationStatus && findingStatusLabel(issue.reconciliationStatus), issue.reconciliationNote),
-		...investigation ? [investigated(issue.investigationImpact, issue.investigationNote), reassessed(assessment)] : [],
+		update(issue.reconciliationStatus && findingStatusLabel(issue.reconciliationStatus), issue.reconciliationNote, issue.reconciledAgainst),
+		...investigation ? [
+			investigated(issue.investigationImpact, issue.investigationNote),
+			reassessed(assessment),
+			statusHistory(issue.statusHistory)
+		] : [],
 		where(issue.file, issue.line, issue.relatedFiles)
 	]);
 }
@@ -1334,8 +1476,8 @@ function questionText(question, investigation, assessment) {
 	return join$1([
 		bold(question.question),
 		question.whyThisMatters,
-		labelled("Answered by the new changes", question.reconciliationAnswer),
-		update(question.reconciliationStatus && questionStatusLabel(question.reconciliationStatus), question.reconciliationNote),
+		labelled(reconciledAnswerHeading(question.reconciledAgainst), question.reconciliationAnswer),
+		update(question.reconciliationStatus && questionStatusLabel(question.reconciliationStatus), question.reconciliationNote, question.reconciledAgainst),
 		...investigation ? [
 			labelled("Answer from investigation", question.investigationAnswer),
 			investigated(question.investigationImpact, question.investigationNote),
@@ -1345,9 +1487,9 @@ function questionText(question, investigation, assessment) {
 	]);
 }
 /** What the last update said about the finding, under the status the card shows beside it. */
-function update(status, note) {
+function update(status, note, against) {
 	if (!note?.trim()) return void 0;
-	return `**After the new commits${status ? ` (${status.toLowerCase()})` : ""}:** ${note.trim()}`;
+	return `**${reconciledAfter(against)}${status ? ` (${status.toLowerCase()})` : ""}:** ${note.trim()}`;
 }
 /**
 * What an investigation concluded, under the verdict the card's badge shows. "Investigated" is the
@@ -1367,6 +1509,24 @@ function reassessed(assessment) {
 	const move = `${assessment.original ?? "ungraded"} → ${assessment.current}, ${sourcePhrase(last.source)}`;
 	return last.reason?.trim() ? `**Reassessed (${move}):** ${last.reason.trim()}` : `**Reassessed:** ${move}.`;
 }
+/**
+* Every change of status, each with what it rested on and the evidence as it read then: the record
+* of why the review reached its conclusion, which a link to a since-edited comment could not keep.
+* Copy only, like the reassessed grade; a feedback draft is not the place for the review's working.
+*/
+function statusHistory(history) {
+	if (!hasStatusHistory(history)) return void 0;
+	return `**Status history:**\n${statusSteps(history).map(({ from, step }) => {
+		const basis = statusBasisPhrase(step);
+		const said = [statusTriggerSentence(step), step.reason?.trim()].filter(Boolean).join(" ");
+		const head = `- ${statusStepHeadline(from, step)}${basis ? ` ${basis}` : ""}${said ? `: ${said}` : ""}`;
+		const evidence = step.evidence;
+		if (!evidence) return head;
+		const quoted = evidence.body ? `: ${evidence.body.replace(/\s+/g, " ")}` : "";
+		const link = evidence.url ? ` (${evidence.url})` : "";
+		return `${head}\n  > ${evidenceAttribution(evidence)}${quoted}${link}`;
+	}).join("\n")}`;
+}
 function labelled(label, text) {
 	return text?.trim() ? `**${label}:** ${text.trim()}` : void 0;
 }
@@ -1409,25 +1569,6 @@ function shortSha$1(sha) {
 	return sha.slice(0, MIN_ABBREVIATED_LENGTH);
 }
 //#endregion
-//#region ../../packages/review-harness/src/domain/utils/relative_time.ts
-function formatRelativeTime(ts, now = Date.now()) {
-	const diffMs = Math.max(0, now - ts);
-	const minute = 6e4;
-	const hour = 60 * minute;
-	const day = 24 * hour;
-	if (diffMs < minute) return "Just now";
-	if (diffMs < hour) {
-		const mins = Math.floor(diffMs / minute);
-		return `${mins} min${mins === 1 ? "" : "s"} ago`;
-	}
-	if (diffMs < day) {
-		const hours = Math.floor(diffMs / hour);
-		return `${hours} hour${hours === 1 ? "" : "s"} ago`;
-	}
-	const days = Math.floor(diffMs / day);
-	return `${days} day${days === 1 ? "" : "s"} ago`;
-}
-//#endregion
 //#region ../../packages/review-harness/src/domain/ui/components/intent_note.ts
 /**
 * The Overview's unclear motive, kept in step with its Intent question.
@@ -2613,9 +2754,9 @@ function renderIssueConfidence(confidence) {
 * is the axis the reviewer is scanning for. They already know what the findings were; what they
 * came back to learn is which ones the author dealt with.
 */
-function renderFindingStatus(status) {
+function renderFindingStatus(status, against) {
 	if (!status) return "";
-	return `<span${pillAttrs(`pr-helper-finding-status pr-helper-finding-status-${status}`, findingStatusTip(status))}>${escapeHtml$1(findingStatusLabel(status))}</span>`;
+	return `<span${pillAttrs(`pr-helper-finding-status pr-helper-finding-status-${status}`, findingStatusTip(status, against))}>${escapeHtml$1(findingStatusLabel(status))}</span>`;
 }
 /**
 * The same pill, for a question.
@@ -2624,9 +2765,9 @@ function renderFindingStatus(status) {
 * a finding is `resolved` and a question is `answered`, which are different events. Nothing fixed
 * the question; somebody now knows the answer.
 */
-function renderQuestionStatus(status) {
+function renderQuestionStatus(status, against) {
 	if (!status) return "";
-	return `<span${pillAttrs(`pr-helper-finding-status pr-helper-finding-status-${status === "answered" ? "resolved" : status}`, questionStatusTip(status))}>${escapeHtml$1(questionStatusLabel(status))}</span>`;
+	return `<span${pillAttrs(`pr-helper-finding-status pr-helper-finding-status-${status === "answered" ? "resolved" : status}`, questionStatusTip(status, against))}>${escapeHtml$1(questionStatusLabel(status))}</span>`;
 }
 /** The model's one-line reason for a status, when it gave one. */
 function renderReconciliationNote(note) {
@@ -2771,7 +2912,7 @@ function renderIssuesTab(session, investigatingId, options) {
           ${options?.askBuddy ? renderAskBuddyMenu("issue") : ""}
         </div>
         <div class="pr-helper-issue-badges">
-          ${renderFindingStatus(issue.reconciliationStatus)}
+          ${renderFindingStatus(issue.reconciliationStatus, issue.reconciledAgainst)}
           ${renderDismissedBadge(isDismissed)}
           ${renderInvestigationImpact(issue.investigationImpact)}
           ${renderSectionTag(issue.sectionId, sections)}
@@ -2783,6 +2924,7 @@ function renderIssuesTab(session, investigatingId, options) {
       ${renderAssessmentRegion("issue", assessment, grading)}
       <p class="pr-helper-issue-desc">${renderInlineText(issue.description)}</p>${renderCardExplanation(explanationOf(session, "issue", issue.id), options)}
       ${renderReconciliationNote(issue.reconciliationNote)}
+      ${renderStatusHistory(issue.statusHistory, now)}
       ${renderInvestigationNote(issue.investigationNote)}
       ${renderExistingDiscussion(issue.existingDiscussion)}
       ${renderFileLocation(issue.file, "pr-helper-issue-loc", issue.line)}
@@ -2811,7 +2953,12 @@ function renderIssuesTab(session, investigatingId, options) {
 */
 function closedFindingsSummary(counts) {
 	const byCommits = counts.done - counts.reviewerClosed;
-	if (counts.reviewerClosed === 0) return `Resolved by the new commits (${counts.done})`;
+	if (counts.reviewerClosed === 0) {
+		const byConversation = counts.byConversation ?? 0;
+		if (byConversation === 0) return `Resolved by the new commits (${counts.done})`;
+		if (byConversation === counts.done) return `Resolved by the conversation (${counts.done})`;
+		return `Resolved (${counts.done})`;
+	}
 	if (byCommits === 0) return `Dismissed by you (${counts.done})`;
 	return `Dealt with (${counts.done})`;
 }
@@ -2854,7 +3001,8 @@ function renderStaleDismissal(stale) {
 function renderDismissToggle(issue, isDismissed, stale, dismissal) {
 	const label = stale ? "Dismiss again" : isDismissed ? "Reopen" : "Dismiss";
 	const settled = issue.reconciliationStatus === "resolved";
-	return `<button type="button" class="pr-helper-issue-dismiss-toggle" data-issue-dismissed="${escapeHtml$1(issue.id)}" data-dismissed="${isDismissed}"${stale ? " data-stale=\"true\"" : ""}${dismissal ? ` data-dismissed-in="${escapeHtml$1(dismissal.sessionId)}"` : ""}${settled ? " data-settled=\"true\"" : ""}>${label}</button>`;
+	const settledBy = settled ? ` data-settled-by="${resolvedByConversation(issue) ? "conversation" : "code"}"` : "";
+	return `<button type="button" class="pr-helper-issue-dismiss-toggle" data-issue-dismissed="${escapeHtml$1(issue.id)}" data-dismissed="${isDismissed}"${stale ? " data-stale=\"true\"" : ""}${dismissal ? ` data-dismissed-in="${escapeHtml$1(dismissal.sessionId)}"` : ""}${settled ? ` data-settled="true"${settledBy}` : ""}>${label}</button>`;
 }
 /**
 * The group an Intent question lives in, keyed like a theme's so the workspace client finds its
@@ -2873,7 +3021,7 @@ function renderQuestionCard(q, sections, answered, records, now = Date.now(), in
 	const settled = q.reconciliationStatus === "answered";
 	const answerToggle = `<button type="button" class="pr-helper-question-answer-toggle" data-question-answered="${escapeHtml$1(q.id)}" data-answered="${answered}"${settled ? " data-settled=\"true\"" : ""}>${answered ? "Mark as unanswered" : "Mark answered"}</button>`;
 	const investigationAnswer = q.investigationAnswer?.trim() ? `<h5>Answer from investigation</h5><p class="pr-helper-issue-desc pr-helper-investigation-answer">${renderInlineText(q.investigationAnswer)}</p>` : "";
-	const reconciliationAnswer = q.reconciliationAnswer?.trim() ? `<h5>Answered by the new changes</h5><p class="pr-helper-issue-desc pr-helper-investigation-answer">${renderInlineText(q.reconciliationAnswer)}</p>` : "";
+	const reconciliationAnswer = q.reconciliationAnswer?.trim() ? `<h5>${escapeHtml$1(reconciledAnswerHeading(q.reconciledAgainst))}</h5><p class="pr-helper-issue-desc pr-helper-investigation-answer">${renderInlineText(q.reconciliationAnswer)}</p>` : "";
 	return `
     <div class="pr-helper-question-card${answered ? " pr-helper-question-card-answered" : ""}${q.investigationImpact ? ` pr-helper-issue-investigation-${q.investigationImpact}` : ""}" data-finding-card="${escapeHtml$1(q.id)}"${questionHome(q) ? ` data-section-id="${escapeHtml$1(questionHome(q))}"` : ""}>
       <div class="pr-helper-issue-header">
@@ -2884,7 +3032,7 @@ function renderQuestionCard(q, sections, answered, records, now = Date.now(), in
           ${options?.askBuddy ? renderAskBuddyMenu("question") : ""}
         </div>
         <div class="pr-helper-issue-badges">
-          ${renderQuestionStatus(q.reconciliationStatus)}
+          ${renderQuestionStatus(q.reconciliationStatus, q.reconciledAgainst)}
           ${renderInvestigationImpact(q.investigationImpact)}
           <!-- Rendered on every card, hidden by CSS inside a theme group, because the heading
                above it already says the same word. The client moves cards between the group and
@@ -5217,14 +5365,19 @@ function updateFacts(outcome) {
 	const counts = outcome.counts;
 	if (!counts || !outcome.toSha) return null;
 	const plural = (n, one, many) => `${n} ${n === 1 ? one : many}`;
+	const byConversation = counts.resolvedByConversation ?? 0;
+	const fixed = counts.resolved - byConversation;
 	const changes = [
-		counts.resolved ? `${plural(counts.resolved, "issue", "issues")} fixed` : "",
+		fixed ? `${plural(fixed, "issue", "issues")} fixed` : "",
+		byConversation ? `${plural(byConversation, "issue", "issues")} resolved by the conversation` : "",
+		counts.reopened ? `${plural(counts.reopened, "issue", "issues")} reopened` : "",
 		counts.newIssues ? plural(counts.newIssues, "new issue", "new issues") : "",
 		counts.affected ? `${counts.affected} to look at again` : "",
 		counts.questionsAnswered ? `${plural(counts.questionsAnswered, "question", "questions")} answered` : ""
 	].filter(Boolean);
 	const grades = counts.gradeChanges ? [`${plural(counts.gradeChanges, "grade change", "grade changes")} suggested`] : [];
-	return [`<code>${escapeHtml$1(outcome.toSha.slice(0, 7))}</code>`, ...[...changes.length ? changes : ["No change to the findings"], ...grades].map(escapeHtml$1)];
+	const basis = outcome.reassessed;
+	return [...basis && !basis.code ? [escapeHtml$1("Reassessed against the conversation")] : [`<code>${escapeHtml$1(outcome.toSha.slice(0, 7))}</code>`, ...basis?.discussion ? [escapeHtml$1("with the conversation")] : []], ...[...changes.length ? changes : ["No change to the findings"], ...grades].map(escapeHtml$1)];
 }
 /**
 * The two things that can go quietly half-wrong, said out loud.
@@ -10535,7 +10688,8 @@ var TOPICS = [
       <li><code>prreviewbuddy open</code> to list the reviews you have and open this workspace</li>
     </ul>
     <p>Or press <kbd class="prb-kbd">⌘P</kbd> (<kbd class="prb-kbd">Ctrl+P</kbd> elsewhere) to add a
-    review from here. <code>prreviewbuddy help</code> lists every command, and
+    review from here. The panel follows the reviews it started while it stays open, and closing it
+    stops nothing. <code>prreviewbuddy help</code> lists every command, and
     <code>prreviewbuddy review --help</code> every option a review takes.</p>
     <p>There is no account and no API key. PR Review Buddy uses the coding agent installed on your
     machine and that agent's existing authentication, and never asks you for a credential.</p>`
@@ -11445,16 +11599,24 @@ function createSlots(capacity) {
 }
 /** How many pull requests one submission may name. See `MAX_PULL_REQUESTS_PER_BATCH`. */
 var MAX_BATCH = 20;
-/** How long a finished batch stays answerable, for a panel that is still open on it. */
+/**
+* How long a finished batch stays answerable once nobody is asking about it. An open panel keeps
+* asking (`KEEPALIVE` in the client is well inside this), so a batch is only forgotten after its
+* panel has gone, and its Retry with it.
+*/
 var FINISHED_BATCH_TTL_MS = 6e5;
 function realAddReviewDeps() {
 	return {
 		resolveAgent: (flag) => resolveAgent(flag ? { flag } : {}),
-		agents: async () => (await detectAgents()).map((agent) => ({
-			id: agent.id,
-			displayName: agent.displayName,
-			installed: agent.state === "installed"
-		})),
+		agents: async () => (await detectAgents()).map((agent) => {
+			const modelHelp = modelHelpOf(agent.id);
+			return {
+				id: agent.id,
+				displayName: agent.displayName,
+				installed: agent.state === "installed",
+				...modelHelp ? { modelHelp } : {}
+			};
+		}),
 		folders: () => discoverWorkingFolders(),
 		summaries: () => recentWorkspaces(Number.MAX_SAFE_INTEGER),
 		remoteOf: originRemote,
@@ -11478,6 +11640,8 @@ function realAddReviewDeps() {
 		findExisting: findExistingReview,
 		prepare: prepareReview,
 		settle: (workspaceId) => settleReview(workspaceId, "standard"),
+		observe: (workspaceId) => observeReview(workspaceId),
+		commitPresent: (root, sha) => refExists(root, sha),
 		track,
 		chooseFolder: folderChooser(),
 		concurrency: 2,
@@ -11493,6 +11657,13 @@ function realAddReviewDeps() {
 		home: homedir()
 	};
 }
+function modelHelpOf(agentId) {
+	try {
+		return agentById(agentId).modelSelectionHelp;
+	} catch {
+		return;
+	}
+}
 function agentNameOf(agentId) {
 	try {
 		return agentById(agentId).displayName;
@@ -11500,10 +11671,60 @@ function agentNameOf(agentId) {
 		return agentId;
 	}
 }
-var refuse = (status, error) => ({
+var refuse = (status, error, extra = {}) => ({
 	status,
-	body: { error }
+	body: {
+		error,
+		...extra
+	}
 });
+function baseChoiceOf(error) {
+	const option = (where) => {
+		const matched = where === "remote" ? error.remote : error.local;
+		const commits = where === "remote" ? error.ranges?.remote : error.ranges?.local;
+		return {
+			base: shorthandOf(matched.ref),
+			display: where === "remote" ? shorthandOf(matched.ref) : shortNameOf(matched.ref),
+			where,
+			...commits ? { commits: commits.length } : {}
+		};
+	};
+	return {
+		name: shortNameOf(error.local.ref),
+		discovered: error.discovered,
+		...error.divergence ? { divergence: error.divergence } : {},
+		options: [option("remote"), option("local")]
+	};
+}
+/**
+* What the panel says for an error a review could not get past.
+*
+* Two errors are known by their class and said in the panel's own words. Anything else keeps its
+* message, which is already written for a person, but only its first paragraph is the sentence:
+* the rest (ref listings, commands to run) goes behind Technical details, kept whole for whoever
+* needs to diagnose it.
+*/
+function refusalOf(error) {
+	const text = message(error);
+	if (error instanceof AmbiguousRefError) {
+		const choice = baseChoiceOf(error);
+		return {
+			error: `\`${choice.name}\` is both a local and a remote branch, and they are different commits. Choose which one to compare against.`,
+			detail: text,
+			baseChoice: choice
+		};
+	}
+	if (error instanceof DetachedHeadError) return { error: "This folder is on a detached HEAD, so there is no branch to review. Check out a branch in it, or review its pull request instead." };
+	return briefly(text);
+}
+/** A message's first paragraph as the sentence, and the whole of it as the detail when there is more. */
+function briefly(text) {
+	const first = text.split(/\n\s*\n/)[0].trim();
+	return first && first !== text.trim() ? {
+		error: first,
+		detail: text
+	} : { error: text };
+}
 /** A path as a person reads it, with their home folder as `~`. */
 function displayPath(path, home) {
 	return home && (path === home || path.startsWith(`${home}/`)) ? `~${path.slice(home.length)}` : path;
@@ -11532,15 +11753,15 @@ function unresolvedAgent(resolution) {
 * harness's own fallback: an id is always passed down, so `startJob` never has to guess.
 */
 async function agentFor(flag, deps) {
-	if (flag !== void 0 && typeof flag !== "string") return refuse(400, "Say which agent by its id.");
+	if (flag !== void 0 && typeof flag !== "string") return refuse(400, "Say which agent by its id.", { field: "agent" });
 	const resolution = await deps.resolveAgent(flag || void 0);
 	if (resolution.kind === "resolved") return { agentId: resolution.agent.id };
-	if (resolution.kind === "ambiguous") return refuse(400, "More than one review agent is installed. Choose one under Review options.");
-	return refuse(resolution.kind === "unknown-id" ? 400 : 409, unresolvedAgent(resolution));
+	if (resolution.kind === "ambiguous") return refuse(400, "More than one review agent is installed. Choose one under Review options.", { field: "agent" });
+	return refuse(resolution.kind === "unknown-id" ? 400 : 409, unresolvedAgent(resolution), { field: "agent" });
 }
 function modelOf(value) {
 	if (value === void 0 || value === null || value === "") return void 0;
-	if (typeof value !== "string" || value.length > 200) return refuse(400, "The model must be a short name.");
+	if (typeof value !== "string" || value.length > 200) return refuse(400, "The model must be a short name.", { field: "model" });
 	return value.trim() || void 0;
 }
 /**
@@ -11649,38 +11870,115 @@ async function previewPullRequests(text, deps) {
 }
 var batches = /* @__PURE__ */ new Map();
 function forgetFinished(now) {
-	for (const [id, batch] of batches) if (batch.finishedAt !== null && now - batch.finishedAt > FINISHED_BATCH_TTL_MS) batches.delete(id);
+	for (const [id, batch] of batches) if (batch.finishedAt !== null && now - Math.max(batch.finishedAt, batch.seenAt) > FINISHED_BATCH_TTL_MS) batches.delete(id);
 }
 function newBatch(rows) {
 	forgetFinished(Date.now());
+	const now = Date.now();
 	const batch = {
 		id: randomUUID(),
 		rows,
-		finishedAt: null
+		finishedAt: now,
+		seenAt: now,
+		running: 0,
+		rerun: () => {}
 	};
 	batches.set(batch.id, batch);
 	return batch;
 }
+/**
+* Count work against a batch, inside the restart guard. The batch is finished only when nothing
+* counted against it is still going, so a retry reopens a batch an open panel can then follow again.
+*/
+function follow(batch, work, deps, driving = true) {
+	batch.running += 1;
+	batch.finishedAt = null;
+	(driving ? deps.track(work) : work).catch(() => {}).finally(() => {
+		batch.running -= 1;
+		if (batch.running === 0) batch.finishedAt = Date.now();
+	});
+}
+function fail(row, error) {
+	const refusal = refusalOf(error);
+	row.status = "failed";
+	row.reason = refusal.error;
+	if (refusal.detail) row.detail = refusal.detail;
+}
 var rowsOf = (batch) => batch.rows.map((row) => ({ ...row }));
 /**
 * Create the review for a row's target, or find the one it has, under the per-target lock. The
 * caller holds an analysis slot: nothing is created without one, so nothing created waits.
 */
-async function prepareRow(row, target, agentId, model, deps) {
-	const prepared = await oneCreationAtATime(target, () => deps.prepare(target, agentId, false, model));
+/**
+* `fresh` is a fresh start's: a new review of the target as it is now, keeping whatever review the
+* branch or request already has, as `--fresh` does. Without it the lookup finds the latest review of
+* the same branch or request, which for a fresh start is the very failure being started over.
+*/
+async function prepareRow(row, target, agentId, model, deps, fresh = false) {
+	const prepared = await oneCreationAtATime(target, () => deps.prepare(target, agentId, fresh, model));
 	row.reviewId = prepared.kind === "new" ? prepared.workspaceId : prepared.existing.id;
-	if (prepared.kind === "existing") row.status = "already-reviewed";
+	if (prepared.kind === "existing") row.status = prepared.existing.inProgress ? "reviewing" : "already-reviewed";
 	else row.status = "reviewing";
 	if (prepared.kind === "resume") row.kept = keptOf(prepared.failure.agentId, prepared.failure.requestedModel, deps);
+	else delete row.kept;
 	return prepared;
 }
-async function settleRow(row, deps) {
-	const settled = await deps.settle(row.reviewId);
+/**
+* Take a prepared row to its end. A new or resumed review is run here, holding the slot. One that
+* something else is already analysing is watched instead, never driven: the watch is handed to the
+* batch rather than awaited, so the caller returns, and its slot goes back, at once, while the row
+* stays Analysing until that analysis ends. Counted against the batch, not against restarts.
+*/
+async function completeRow(row, prepared, batch, deps) {
+	if (prepared.kind !== "existing") return settleRow(row, deps.settle(row.reviewId));
+	if (prepared.existing.inProgress) follow(batch, settleRow(row, deps.observe(row.reviewId)), deps, false);
+}
+async function settleRow(row, settling) {
+	const settled = await settling;
 	if (settled.ok) row.status = "ready";
-	else {
+	else if (settled.stopped) {
 		row.status = "failed";
-		row.reason = settled.stopped ? "Stopped" : settled.reason;
+		row.reason = "Stopped";
+	} else fail(row, settled.reason);
+}
+/**
+* A retry runs against the commit the row was first resolved to, never a newer one: a retry
+* resumes what was asked for, and a moved branch or pull request is a fresh review's business. When
+* that commit has gone (a force push, then a prune), there is nothing left to retry, and the row
+* says so and offers the fresh start instead of quietly reviewing something else.
+*/
+async function stillThere(row, target, what, deps) {
+	if (await deps.commitPresent(target.originRepoPath, target.sha)) return true;
+	row.status = "failed";
+	row.reason = `The commit this review was of (${target.sha.slice(0, 7)}) is no longer in this repository, so it can't be retried as it was. Start a fresh review to analyse the ${what} as it is now.`;
+	row.stale = true;
+	return false;
+}
+/**
+* Retry a row whose review exists, by that review's id. Not through the lookup a start uses, which
+* finds the latest review of the branch or request: one made since, of newer commits, would be
+* handed back in place of the one that failed, and a retry would quietly become a different review.
+*
+* Resumed when it is still a failure nothing is running, as its own page's Retry does. Otherwise
+* something has taken it up since (that Retry, a terminal), and it is watched rather than run again.
+*/
+async function retryReview(row, batch, deps) {
+	const reviewId = row.reviewId;
+	const kept = deps.resumeOf(reviewId);
+	row.status = "reviewing";
+	if (kept) {
+		row.kept = kept;
+		return settleRow(row, deps.settle(reviewId));
 	}
+	follow(batch, settleRow(row, deps.observe(reviewId)), deps, false);
+}
+/**
+* A fresh start that ended before it made its review leaves the row exactly as it was: the old
+* target, the old review, and still `stale`. So the row keeps offering the fresh start, and a plain
+* Retry finds the old commit gone again, rather than resuming the old review against it.
+*/
+function keepFreshPending(row, replaced) {
+	if (row.status === "failed" && !replaced) row.stale = true;
 }
 function keptOf(agentId, model, deps) {
 	return {
@@ -11726,40 +12024,55 @@ async function startPullRequestBatch(body, deps) {
 	})));
 	/** Which row claimed each pull request, by what it resolved to rather than how it was spelled. */
 	const claimed = /* @__PURE__ */ new Map();
-	const lane = async (item, index) => {
+	/** Each row's pull request as it was first resolved: head, base and all. What a retry runs against. */
+	const resolved = [];
+	const lane = async (item, index, fresh = false) => {
 		const row = batch.rows[index];
 		const release = await deps.slots.acquire();
 		row.status = "reviewing";
+		/** A fresh start has made its review, so the row now belongs to the new target. */
+		let replaced = false;
 		try {
-			const remote = await deps.remoteOf(item.folder);
-			if (!isGitHubRepository(remote, item.owner, item.repo)) {
-				row.status = "failed";
-				row.reason = remote ? `This folder is a clone of ${remote.owner}/${remote.repo}, not ${item.owner}/${item.repo}` : `This folder is not a clone of ${item.owner}/${item.repo}`;
-				return;
+			let target = fresh ? void 0 : resolved[index];
+			if (target) {
+				if (!await stillThere(row, target, "pull request", deps)) return;
+				if (row.reviewId) return await retryReview(row, batch, deps);
+			} else {
+				const remote = await deps.remoteOf(item.folder);
+				if (!isGitHubRepository(remote, item.owner, item.repo)) {
+					row.status = "failed";
+					row.reason = remote ? `This folder is a clone of ${remote.owner}/${remote.repo}, not ${item.owner}/${item.repo}` : `This folder is not a clone of ${item.owner}/${item.repo}`;
+					return;
+				}
+				target = await deps.resolvePullRequest(item.folder, item.url);
+				if (!fresh) resolved[index] = target;
 			}
-			const target = await deps.resolvePullRequest(item.folder, item.url);
 			const identity = batchIdentity(target);
 			const first = claimed.get(identity);
-			if (first !== void 0) {
+			if (first !== void 0 && first !== index) {
 				row.status = "already-reviewed";
 				row.reason = `Same pull request as ${batch.rows[first].label}`;
 				return;
 			}
 			claimed.set(identity, index);
-			if ((await prepareRow(row, target, agent.agentId, model, deps)).kind !== "existing") await settleRow(row, deps);
+			const prepared = await prepareRow(row, target, agent.agentId, model, deps, fresh);
+			if (fresh) {
+				resolved[index] = target;
+				replaced = true;
+			}
+			await completeRow(row, prepared, batch, deps);
 		} catch (error) {
-			row.status = "failed";
-			row.reason = message(error);
+			fail(row, error);
 		} finally {
+			if (fresh) keepFreshPending(row, replaced);
 			release();
 		}
 	};
-	deps.track(runBatch(items, {
+	batch.rerun = (index, fresh) => follow(batch, lane(items[index], index, fresh), deps);
+	follow(batch, runBatch(items, {
 		concurrency: deps.concurrency,
 		run: lane
-	})).catch(() => {}).finally(() => {
-		batch.finishedAt = Date.now();
-	});
+	}), deps);
 	return {
 		status: 200,
 		body: {
@@ -11769,13 +12082,13 @@ async function startPullRequestBatch(body, deps) {
 	};
 }
 /**
-* A batch's rows as they stand. A batch this server does not know was either finished long ago,
-* which an open panel never asks about because it stops asking once a batch finishes, or lost to a
-* restart, which is the case worth saying plainly: whatever had not started never will.
+* A batch's rows as they stand. Asking counts as watching: a batch an open panel is still asking
+* about is never forgotten, so its Retry stays good for as long as the panel is open.
 */
 function batchRows(id) {
 	const batch = batches.get(id);
-	if (!batch) return refuse(404, "The workspace server no longer knows this batch, most likely because it restarted. Reviews that had started are in your list. Any that were still waiting did not start.");
+	if (!batch) return lostBatch();
+	batch.seenAt = Date.now();
 	return {
 		status: 200,
 		body: {
@@ -11784,10 +12097,39 @@ function batchRows(id) {
 		}
 	};
 }
-/** A target refusal in the panel's words where the CLI's would name a command. */
-function targetRefusal(error) {
-	if (error instanceof DetachedHeadError) return "This folder is on a detached HEAD, so there is no branch to review. Check out a branch in it, or review its pull request instead.";
-	return message(error);
+/**
+* Said without guessing why. A restart forgets every batch, and a batch nobody has asked about for
+* a while is forgotten too; the server cannot tell which happened, so it says what follows from
+* either.
+*/
+var lostBatch = () => refuse(404, "This batch is no longer on the workspace server, so it can’t be followed or retried here. Reviews that had started are in your reviews list. Any that were still queued did not start.");
+/**
+* Run one failed row of a batch again, as it was first asked for: the same folder, agent, model
+* and base, and the same commits, never the branch or pull request as it has since moved on. A
+* review that was created and then failed resumes, as a Retry does on its own page. `fresh` is the
+* one exception, sent only when those commits have gone: it looks again at what is there now.
+* The other rows are left exactly as they are, and the batch is followed again until it ends.
+*/
+function retryBatchRow(id, key, fresh = false) {
+	const batch = batches.get(id);
+	if (!batch) return lostBatch();
+	const index = batch.rows.findIndex((row) => row.key === key);
+	const row = batch.rows[index];
+	if (!row) return refuse(404, "That review is not part of this batch.");
+	if (row.status !== "failed") return refuse(409, "Only a review that failed can be tried again.");
+	row.status = "waiting";
+	delete row.reason;
+	delete row.detail;
+	delete row.stale;
+	batch.seenAt = Date.now();
+	batch.rerun(index, fresh === true);
+	return {
+		status: 200,
+		body: {
+			rows: rowsOf(batch),
+			finished: false
+		}
+	};
 }
 /** The recent and discoverable folders, for the Branch panel's list. */
 async function listFolders(deps) {
@@ -11825,7 +12167,7 @@ async function inspectFolder(rawPath, deps, rawBase) {
 			status: 200,
 			body: {
 				ok: false,
-				error: targetRefusal(error)
+				...refusalOf(error)
 			}
 		};
 	}
@@ -11855,10 +12197,14 @@ async function inspectFolder(rawPath, deps, rawBase) {
 /**
 * Review the branch checked out in a folder: `prreviewbuddy` run there.
 *
-* With a free analysis slot it answers once the review exists, and the analysis runs on in this
-* process, counted by `track` like a Retry. With none free it answers `waiting` and a one-row batch
-* to watch, and creates nothing until a slot frees: a review created to wait is a job nobody is
-* running, which the sweep would fail. A review the branch already has needs no slot to hand back.
+* Always answers with a one-row batch, which is what the panel follows, so a branch shows its
+* progress exactly as a pull request does. With a free analysis slot it answers once the review
+* exists, and the analysis runs on in this process, counted by `track` like a Retry. With none free
+* it answers `waiting` and creates nothing until a slot frees: a review created to wait is a job
+* nobody is running, which the sweep would fail. A review the branch already has needs no slot.
+*
+* A refusal before anything exists comes back as a refusal, with the base question when that is
+* what it was, so the panel can ask it beside the folder rather than as a failed row.
 */
 async function startBranchReview(body, deps) {
 	const path = typeof body?.path === "string" ? expandPath(body.path, deps.home) : null;
@@ -11870,7 +12216,10 @@ async function startBranchReview(body, deps) {
 	try {
 		target = await deps.resolveBranch(path, base);
 	} catch (error) {
-		return refuse(400, targetRefusal(error));
+		return {
+			status: 400,
+			body: refusalOf(error)
+		};
 	}
 	const agent = await agentFor(body?.agent, deps);
 	if (isAnswer(agent)) return agent;
@@ -11879,55 +12228,82 @@ async function startBranchReview(body, deps) {
 		label: target.branch,
 		status: "waiting"
 	};
+	const batch = newBatch([row]);
+	/**
+	* The branch's run, holding a slot. A retry runs against the commit first resolved, wherever the
+	* branch has moved since, unless `fresh`, which looks at the folder again as it is now.
+	*/
+	const run = async (release, again) => {
+		const fresh = again === "fresh";
+		let replaced = false;
+		try {
+			const next = fresh ? await deps.resolveBranch(path, base) : target;
+			if (again === "retry") {
+				if (!await stillThere(row, target, "branch", deps)) return;
+				if (row.reviewId) return await retryReview(row, batch, deps);
+			}
+			const prepared = await prepareRow(row, next, agent.agentId, model, deps, fresh);
+			target = next;
+			replaced = fresh;
+			await completeRow(row, prepared, batch, deps);
+		} catch (error) {
+			fail(row, error);
+		} finally {
+			if (fresh) keepFreshPending(row, replaced);
+			release();
+		}
+	};
+	batch.rerun = (_index, fresh) => follow(batch, (async () => run(await deps.slots.acquire(), fresh ? "fresh" : "retry"))(), deps);
+	const answer = (outcome) => ({
+		status: 200,
+		body: {
+			outcome,
+			batchId: batch.id,
+			rows: rowsOf(batch),
+			...row.reviewId ? { reviewId: row.reviewId } : {},
+			...row.kept ? { kept: row.kept } : {}
+		}
+	});
 	const release = deps.slots.tryAcquire();
 	if (!release) {
 		const existing = await deps.findExisting(target);
-		if (existing && !deps.resumeOf(existing.id)) return {
-			status: 200,
-			body: {
-				outcome: "existing",
-				reviewId: existing.id
-			}
-		};
-		const batch = newBatch([row]);
-		deps.track((async () => {
-			const later = await deps.slots.acquire();
-			try {
-				if ((await prepareRow(row, target, agent.agentId, model, deps)).kind !== "existing") await settleRow(row, deps);
-			} catch (error) {
-				row.status = "failed";
-				row.reason = message(error);
-			} finally {
-				later();
-			}
-		})()).finally(() => {
-			batch.finishedAt = Date.now();
-		});
-		return {
-			status: 200,
-			body: {
-				outcome: "waiting",
-				batchId: batch.id
+		if (existing && !deps.resumeOf(existing.id)) {
+			row.reviewId = existing.id;
+			if (!existing.inProgress) {
+				row.status = "already-reviewed";
+				return answer("existing");
 			}
-		};
+			row.status = "reviewing";
+			follow(batch, settleRow(row, deps.observe(existing.id)), deps, false);
+			return answer("existing");
+		}
+		follow(batch, (async () => run(await deps.slots.acquire(), "first"))(), deps);
+		return answer("waiting");
 	}
 	let prepared;
 	try {
 		prepared = await prepareRow(row, target, agent.agentId, model, deps);
 	} catch (error) {
 		release();
-		return refuse(409, message(error));
+		batches.delete(batch.id);
+		return {
+			status: 409,
+			body: refusalOf(error)
+		};
 	}
-	if (prepared.kind === "existing") release();
-	else deps.track(deps.settle(row.reviewId)).catch(() => {}).finally(release);
-	return {
-		status: 200,
-		body: {
-			outcome: prepared.kind,
-			reviewId: row.reviewId,
-			...row.kept ? { kept: row.kept } : {}
+	if (prepared.kind === "existing") {
+		await completeRow(row, prepared, batch, deps);
+		release();
+	} else follow(batch, (async () => {
+		try {
+			await settleRow(row, deps.settle(row.reviewId));
+		} catch (error) {
+			fail(row, error);
+		} finally {
+			release();
 		}
-	};
+	})(), deps);
+	return answer(prepared.kind);
 }
 async function chooseFolder(deps) {
 	if (!deps.chooseFolder) return refuse(404, "Choosing a folder is not available on this system. Type its path instead.");
@@ -11951,7 +12327,7 @@ A developer is reviewing a specific code change and is looking at a review guide
 
 Answer only in relation to this change and the repository it lives in. You have the working tree, so open the files, trace callers and read history wherever that settles the question. Do not speculate about code you could have read.
 
-If a question cannot be answered from this change and this repository, say so plainly and say what would answer it. Do not pad the answer out with general advice about the topic; a developer mid-review wants the specific answer or an honest "that isn't determinable from here".
+If a question cannot be answered from this change, this repository and the pull request context below, say so plainly and say what information is missing. Do not suggest shell commands, API calls or other ways to retrieve forge data yourself. Do not pad the answer out with general advice about the topic; a developer mid-review wants the specific answer or an honest "that isn't determinable from here".
 
 Write in short paragraphs and keep it to what was asked. Markdown renders, so use it where it carries meaning: backticks for identifiers and paths, a fenced block for a snippet worth reading as code rather than described in a sentence, a bullet list where the answer genuinely is a list. Prose is still the default. No headings, and do not break a paragraph into bullets to look organised.`;
 var AskUnavailableError = class extends Error {};
@@ -12058,6 +12434,8 @@ function buildPrompt$2(workspace, question, sectionId, cwd, context = {}) {
 		"---",
 		"DIFF:",
 		workspace.diff,
+		"---",
+		chatConversationSection(context.conversation ?? storedConversation(workspace)),
 		...reading ? ["---", reading] : [],
 		...recent.length > 0 ? [
 			"---",
@@ -13761,6 +14139,8 @@ async function handleAddReview(req, res, pathname, options) {
 		if (route === "pull-requests") return startPullRequestBatch(body, deps);
 		if (route === "folder/inspect") return inspectFolder(body?.path, deps, body?.base);
 		if (route === "branch") return startBranchReview(body, deps);
+		const retry = /^batches\/([0-9a-f-]{36})\/retry$/.exec(route);
+		if (retry) return retryBatchRow(retry[1], body?.key, body?.fresh);
 		return null;
 	};
 	const result = await answer();
@@ -14320,25 +14700,15 @@ async function kissFreshnessOrNull(workspace) {
 */
 async function handleRefreshPr(res, workspace) {
 	const reattributing = JSON.stringify(workspace.session.result);
+	adoptLegacyBaseline(workspace);
+	const startedAt = Date.now();
 	let outcome;
 	try {
 		outcome = await refreshPrContext(workspace);
 	} catch {
-		outcome = {
-			at: Date.now(),
-			ok: false,
-			message: "The pull request could not be re-read. Nothing here has changed."
-		};
+		outcome = unforeseenFailure(startedAt);
 	}
-	workspace.lastPrRefresh = outcome;
-	mutateWorkspace(workspace.id, (current) => {
-		current.prContext = workspace.prContext;
-		current.lastPrRefresh = workspace.lastPrRefresh;
-		if (JSON.stringify(current.session.result) === reattributing) current.session = {
-			...current.session,
-			result: workspace.session.result
-		};
-	});
+	saveRefresh(workspace, outcome, reattributing);
 	record({
 		event: "pr_conversation_rechecked",
 		reviewId: workspace.id,
@@ -14557,10 +14927,16 @@ async function handleAsk(req, res, workspace) {
 	try {
 		let answer;
 		try {
+			const reattributing = JSON.stringify(workspace.session.result);
+			const { prepared, refresh } = await prepareConversationWithin(workspace, ASK_REREAD_CEILING_MS);
+			if (refresh) try {
+				saveRefresh(workspace, refresh, reattributing);
+			} catch {}
 			answer = await askAboutChange(workspace, question, sectionId, run.signal, {
 				...explains ? { explaining: explains } : {},
 				...continuing ? { continuing } : {},
-				...reassessed ? { reassessing: reassessed } : {}
+				...reassessed ? { reassessing: reassessed } : {},
+				conversation: prepared
 			});
 		} catch (error) {
 			failed();
@@ -15158,7 +15534,7 @@ function markAbandoned(job, now) {
 	if (isClaimed(job.id, now)) return false;
 	const current = loadJob(job.id);
 	if (!current || current.updatedAt !== job.updatedAt) return false;
-	const abandoned = fail(current, ABANDONED_MESSAGE);
+	const abandoned = fail$1(current, ABANDONED_MESSAGE);
 	saveJob(abandoned);
 	announceJob(abandoned);
 	return true;