- ${lines.map(renderDiffLine).join("")}
+
${renderedLines.join("")}
+
+ `;
+}
+
+function renderPullRequestInlineComment(context, path, hunkIndex) {
+ const selection = context?.selection;
+ const lines = arrayValue(selection?.lines);
+ if (!lines.some((line) => line.path === path && line.hunk_index === hunkIndex)) return "";
+
+ const first = lines[0] || {};
+ const last = lines[lines.length - 1] || first;
+ const firstNumber = first.new_number || first.old_number || "?";
+ const lastNumber = last.new_number || last.old_number || firstNumber;
+ const range = firstNumber === lastNumber ? `line ${firstNumber}` : `lines ${firstNumber}–${lastNumber}`;
+ const comment = String(selection.comment || "");
+ const disabled = comment.trim() && !context.selectionLocked ? "" : "disabled";
+ return `
+
`;
}
-function renderDiffLine(line) {
+function renderDiffLine(line, lineIndex = 0, options = {}) {
const kind = String(line.kind || "context");
const marker = kind === "added" ? "+" : kind === "removed" ? "-" : kind === "meta" ? "\\" : " ";
+ const context = options.pullRequestContext;
+ const selectable = context && ["added", "removed", "context"].includes(kind);
+ const descriptor = selectable ? {
+ path: options.path,
+ hunk_index: Number(options.hunkIndex),
+ line_index: Number(lineIndex),
+ } : null;
+ const selected = descriptor && arrayValue(context.selectedLines)
+ .some((item) => pullRequestLineKey(item) === pullRequestLineKey(descriptor));
+ const lineNumber = line.new_number || line.old_number || "";
+ const container = selectable ? "label" : "div";
return `
-
+ <${container} class="diff-line ${escapeAttr(kind)}${selected ? " selected" : ""}${selectable ? " selectable" : ""}">
+ ${selectable ? `${selected ? "✓" : ""}` : ""}
${diffLineNumber(line.old_number)}
${diffLineNumber(line.new_number)}
${escapeHtml(marker)}
${escapeHtml(line.content || "")}
-
+
`;
}
@@ -6630,6 +7392,330 @@ function pullRequestDiffKey(agentKey, pullRequestId) {
return `${agentKey || ""}:${pullRequestId || ""}`;
}
+function pullRequestDiffSelection(agentKey, pullRequestId, snapshotId = "") {
+ const key = pullRequestDiffKey(agentKey, pullRequestId);
+ const current = state.pullRequestDiffSelections[key];
+ if (!current || (snapshotId && current.snapshotId !== snapshotId)) {
+ state.pullRequestDiffSelections[key] = { snapshotId, anchor: null, lines: [], comment: "" };
+ }
+ return state.pullRequestDiffSelections[key];
+}
+
+function pullRequestLineKey(line) {
+ return [line?.path || "", Number(line?.hunk_index), Number(line?.line_index)].join("\u0000");
+}
+
+function pullRequestDiffLine(diff, path, hunkIndex, lineIndex) {
+ const file = arrayValue(diff?.files).find((item) => (item.path || item.old_path) === path);
+ const line = arrayValue(arrayValue(file?.hunks)[hunkIndex]?.lines)[lineIndex];
+ if (!line || !["added", "removed", "context"].includes(line.kind)) return null;
+ return {
+ path,
+ hunk_index: Number(hunkIndex),
+ line_index: Number(lineIndex),
+ kind: line.kind,
+ side: line.kind === "removed" ? "left" : line.kind === "added" ? "right" : "both",
+ old_number: line.old_number,
+ new_number: line.new_number,
+ content: line.content || "",
+ };
+}
+
+function selectPullRequestDiffLine(target, extendRange = false) {
+ const agentKey = target.dataset.agentKey;
+ const pullRequestId = target.dataset.pullRequestId;
+ const snapshotId = target.dataset.snapshotId;
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(agentKey, pullRequestId)];
+ const selected = pullRequestDiffSelection(agentKey, pullRequestId, snapshotId);
+ const line = pullRequestDiffLine(
+ diff,
+ target.dataset.reviewLinePath,
+ Number(target.dataset.reviewLineHunk),
+ Number(target.dataset.reviewLineIndex)
+ );
+ if (!line) {
+ showGrowl("That diff line is no longer available. Refresh the diff.", "need");
+ return;
+ }
+
+ if (extendRange && selected.anchor) {
+ if (selected.anchor.path !== line.path || selected.anchor.hunk_index !== line.hunk_index) {
+ showGrowl("A range must stay inside one diff hunk", "need");
+ return;
+ }
+ const start = Math.min(selected.anchor.line_index, line.line_index);
+ const finish = Math.max(selected.anchor.line_index, line.line_index);
+ const range = [];
+ for (let index = start; index <= finish; index += 1) {
+ const item = pullRequestDiffLine(diff, line.path, line.hunk_index, index);
+ if (item) range.push(item);
+ }
+ if (range.length > PROMPT_PULL_REQUEST_CONTEXT_LIMITS.maxLines) {
+ showGrowl(`Select at most ${PROMPT_PULL_REQUEST_CONTEXT_LIMITS.maxLines} contiguous lines`, "need");
+ return;
+ }
+ selected.lines = range;
+ } else if (selected.lines.some((item) => pullRequestLineKey(item) === pullRequestLineKey(line))) {
+ selected.anchor = null;
+ selected.lines = [];
+ selected.comment = "";
+ } else {
+ selected.anchor = line;
+ selected.lines = [line];
+ selected.comment = "";
+ }
+ syncPullRequestDiffSelection(agentKey, pullRequestId, { focusComment: selected.lines.length > 0, scrollTarget: target });
+}
+
+function syncPullRequestDiffSelection(agentKey, pullRequestId, options = {}) {
+ const agent = findAgent(agentKey);
+ const item = arrayValue(state.pullRequests[agentKey]?.items).find((candidate) => candidate.id === pullRequestId);
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(agentKey, pullRequestId)];
+ if (!agent || !item || !diff || diff.error) return false;
+
+ const selection = pullRequestDiffSelection(agentKey, pullRequestId, diff.snapshot_id || "");
+ const viewer = document.querySelector(
+ `[data-pr-diff-viewer][data-agent-key="${CSS.escape(agentKey)}"][data-pull-request-id="${CSS.escape(pullRequestId)}"]`
+ );
+ if (!viewer) return false;
+
+ const scrollSnapshot = capturePullRequestScrollPosition(options.scrollTarget instanceof Element ? options.scrollTarget : viewer);
+ const selectedKeys = new Set(selection.lines.map(pullRequestLineKey));
+ const controls = Array.from(viewer.querySelectorAll("[data-select-pr-diff-line]"));
+ const selectionLocked = state.pendingPullRequestCommentKeys.has(agentKey);
+ syncPullRequestDiffLineControls(controls, selectedKeys, selectionLocked);
+
+ viewer.querySelectorAll("[data-pr-inline-comment]").forEach((comment) => comment.remove());
+ if (selection.lines.length) {
+ const finalLine = selection.lines.at(-1);
+ const finalControl = controls.find((control) => (
+ pullRequestLineKey(pullRequestLineDescriptor(control)) === pullRequestLineKey(finalLine)
+ ));
+ finalControl?.closest(".diff-line")?.insertAdjacentHTML(
+ "afterend",
+ renderPullRequestInlineComment(
+ pullRequestDiffRenderContext(agent, item, diff, selection),
+ finalLine.path,
+ finalLine.hunk_index
+ )
+ );
+ }
+
+ const selectionSlot = document.querySelector("[data-pr-context-selection-slot]");
+ if (selectionSlot) selectionSlot.innerHTML = renderPullRequestLineSelection(agent, item, selection);
+ restorePullRequestScrollPosition(scrollSnapshot);
+ window.requestAnimationFrame(() => {
+ // A native checkbox inside a label can finish its activation after the delegated click handler.
+ // Reassert the latest state model once without rebuilding the diff. A newer
+ // selection may have replaced this callback's snapshot in the same frame.
+ const currentSelection = pullRequestDiffSelection(agentKey, pullRequestId, diff.snapshot_id || "");
+ const currentSelectedKeys = new Set(currentSelection.lines.map(pullRequestLineKey));
+ syncPullRequestDiffLineControls(controls, currentSelectedKeys, state.pendingPullRequestCommentKeys.has(agentKey));
+ if (options.focusComment && currentSelection.lines.length) {
+ document.querySelector("[data-pr-context-comment]")?.focus({ preventScroll: true });
+ }
+ restorePullRequestScrollPosition(scrollSnapshot);
+ });
+ return true;
+}
+
+function syncPullRequestDiffLineControls(controls, selectedKeys, selectionLocked = false) {
+ controls.forEach((control) => {
+ const key = pullRequestLineKey(pullRequestLineDescriptor(control));
+ const checked = selectedKeys.has(key);
+ control.checked = checked;
+ control.disabled = selectionLocked;
+ control.closest(".diff-line")?.classList.toggle("selected", checked);
+ const mark = control.nextElementSibling;
+ mark?.classList.toggle("selected", checked);
+ if (mark) mark.textContent = checked ? "✓" : "";
+ });
+}
+
+function pullRequestLineDescriptor(control) {
+ return {
+ path: control.dataset.reviewLinePath,
+ hunk_index: Number(control.dataset.reviewLineHunk),
+ line_index: Number(control.dataset.reviewLineIndex),
+ };
+}
+
+function capturePullRequestScrollPosition(target) {
+ const anchor = target.closest?.(".diff-line") || null;
+ const containers = [];
+ let current = target;
+ while (current && current !== document.body) {
+ if (current.matches?.("[data-preserve-scroll]")) {
+ containers.push({ element: current, top: current.scrollTop, left: current.scrollLeft });
+ }
+ current = current.parentElement;
+ }
+ return {
+ anchor,
+ anchorTop: anchor?.getBoundingClientRect().top,
+ containers,
+ page: { top: window.scrollY, left: window.scrollX },
+ };
+}
+
+function restorePullRequestScrollPosition(snapshot) {
+ if (!snapshot) return;
+ snapshot.containers.forEach(({ element, top, left }) => {
+ if (!element.isConnected) return;
+ element.scrollTop = top;
+ element.scrollLeft = left;
+ });
+ window.scrollTo(snapshot.page.left, snapshot.page.top);
+ if (!snapshot.anchor?.isConnected || !Number.isFinite(snapshot.anchorTop)) return;
+
+ const anchorDelta = snapshot.anchor.getBoundingClientRect().top - snapshot.anchorTop;
+ if (Math.abs(anchorDelta) < 0.5) return;
+ const verticalContainer = snapshot.containers.find(({ element }) => (
+ element.scrollHeight > element.clientHeight && ["auto", "scroll"].includes(getComputedStyle(element).overflowY)
+ ));
+ if (verticalContainer) verticalContainer.element.scrollTop += anchorDelta;
+ else window.scrollBy(0, anchorDelta);
+}
+
+function pendingPullRequestContextsFor(agentKey) {
+ const key = String(agentKey || "");
+ if (!key) return [];
+ state.pendingPullRequestContexts[key] ||= [];
+ return state.pendingPullRequestContexts[key];
+}
+
+function pullRequestContextFingerprint(context) {
+ return [context.pull_request_id, context.snapshot_id, ...arrayValue(context.lines).map(pullRequestLineKey)].join("|");
+}
+
+function selectedPullRequestCommentContext(agentKey, pullRequestId) {
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(agentKey, pullRequestId)];
+ const selection = pullRequestDiffSelection(agentKey, pullRequestId, diff?.snapshot_id || "");
+ const comment = String(selection.comment || "").trim();
+ if (!selection.lines.length) return null;
+ if (!comment) {
+ showGrowl("Write a comment for the selected lines", "need");
+ document.querySelector("[data-pr-context-comment]")?.focus({ preventScroll: true });
+ return null;
+ }
+
+ return {
+ id: `pr-context-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+ pull_request_id: pullRequestId,
+ snapshot_id: selection.snapshotId,
+ repository: diff.repository || "repository",
+ number: diff.number,
+ comment,
+ lines: selection.lines.map((line) => ({ ...line })),
+ };
+}
+
+function attachSelectedPullRequestLines(agentKey, pullRequestId) {
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(agentKey, pullRequestId)];
+ const selection = pullRequestDiffSelection(agentKey, pullRequestId, diff?.snapshot_id || "");
+ const context = selectedPullRequestCommentContext(agentKey, pullRequestId);
+ if (!context) return;
+
+ const pending = pendingPullRequestContextsFor(agentKey);
+ if (pending.some((item) => pullRequestContextFingerprint(item) === pullRequestContextFingerprint(context))) {
+ showGrowl("That pull request range is already attached", "need");
+ return;
+ }
+ if (pending.length >= PROMPT_PULL_REQUEST_CONTEXT_LIMITS.maxContexts) {
+ showGrowl(`Attach at most ${PROMPT_PULL_REQUEST_CONTEXT_LIMITS.maxContexts} pull request ranges`, "need");
+ return;
+ }
+
+ pending.push(context);
+ selection.anchor = null;
+ selection.lines = [];
+ selection.comment = "";
+ syncPullRequestDiffSelection(agentKey, pullRequestId);
+ render();
+ showGrowl("Comment section added", "done");
+}
+
+function promptPullRequestContextPayload(context, options = {}) {
+ return {
+ pull_request_id: context.pull_request_id,
+ snapshot_id: context.snapshot_id,
+ ...(options.includeComment && context.comment ? { comment: context.comment } : {}),
+ lines: arrayValue(context.lines).map((line) => ({
+ path: line.path,
+ hunk_index: line.hunk_index,
+ line_index: line.line_index,
+ })),
+ };
+}
+
+function sendSelectedPullRequestComment(agentKey, pullRequestId) {
+ const agent = findAgent(agentKey);
+ if (!agent || agentIsRunning(agent) || state.pendingComposerKeys.has(agentKey) || state.pendingPullRequestCommentKeys.has(agentKey)) {
+ showGrowl("Wait for the agent to finish before sending another comment", "need");
+ return;
+ }
+ const context = selectedPullRequestCommentContext(agentKey, pullRequestId);
+ if (!context) return;
+
+ const prompt = context.comment;
+ const pendingMessageId = addPendingConversationMessage(
+ agentKey,
+ pendingPromptMessageBlock(agentKey, prompt, [], [context])
+ );
+ state.pendingPullRequestCommentKeys.add(agentKey);
+ syncPullRequestDiffSelection(agentKey, pullRequestId);
+ render();
+ mutate(async () => {
+ await apiPost(`/agents/${encodeURIComponent(agentKey)}/messages`, {
+ prompt,
+ start: true,
+ attachments: [],
+ pull_request_contexts: [promptPullRequestContextPayload(context)],
+ });
+ const selection = pullRequestDiffSelection(agentKey, pullRequestId, context.snapshot_id);
+ selection.anchor = null;
+ selection.lines = [];
+ selection.comment = "";
+ state.pendingPullRequestCommentKeys.delete(agentKey);
+ removePendingConversationMessage(agentKey, pendingMessageId, { render: false });
+ }).finally(() => {
+ state.pendingPullRequestCommentKeys.delete(agentKey);
+ syncPullRequestDiffSelection(agentKey, pullRequestId);
+ removePendingConversationMessage(agentKey, pendingMessageId);
+ });
+}
+
+function removePendingPullRequestContext(agentKey, id) {
+ state.pendingPullRequestContexts[agentKey] = pendingPullRequestContextsFor(agentKey)
+ .filter((context) => context.id !== id);
+ render();
+}
+
+function clearActivePullRequestDiffSelection() {
+ const route = parseRoute();
+ if (route.type !== "agentPullRequests") return false;
+ const pullRequestId = selectedPullRequestId(route.key, route.pullRequestId);
+ return clearPullRequestDiffSelection(route.key, pullRequestId);
+}
+
+function clearPullRequestDiffSelection(agentKey, pullRequestId) {
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(agentKey, pullRequestId)];
+ const selection = pullRequestDiffSelection(agentKey, pullRequestId, diff?.snapshot_id || "");
+ if (!selection.lines.length) return false;
+ selection.anchor = null;
+ selection.lines = [];
+ selection.comment = "";
+ syncPullRequestDiffSelection(agentKey, pullRequestId);
+ return true;
+}
+
+function handlePullRequestSelectionEscape(event) {
+ if (event.key !== "Escape" || state.speechRecognition) return;
+ if (!clearActivePullRequestDiffSelection()) return;
+ event.preventDefault();
+ event.stopPropagation();
+}
+
function selectedPullRequestId(agentKey, requestedId = "") {
const items = state.pullRequests[agentKey]?.items || [];
if (requestedId && items.some((item) => item.id === requestedId)) return requestedId;
@@ -6644,6 +7730,14 @@ function pullRequestFreshnessLabel(item) {
return snapshot.fetched_at ? `fetched ${timeShort(snapshot.fetched_at)}` : "snapshot";
}
+function pullRequestStatus(item) {
+ if (item?.merged === true) return { key: "merged", label: "Merged", className: "info" };
+ if (item?.state === "closed") return { key: "closed", label: "Closed", className: "detail" };
+ if (item?.draft === true) return { key: "draft", label: "Draft", className: "need" };
+ if (item?.state === "open") return { key: "open", label: "Open", className: "done" };
+ return null;
+}
+
function shortSha(value) {
const text = String(value || "");
return text.length > 8 ? text.slice(0, 8) : text;
@@ -7467,6 +8561,46 @@ function renderPendingAttachments(agent) {
`;
}
+function renderPendingPullRequestContexts(agent) {
+ const pending = pendingPullRequestContextsFor(agent.key);
+ if (!pending.length) return "";
+
+ return `
+
+
+
+ ${pending.map((context) => renderPendingPullRequestContext(agent.key, context)).join("")}
+
+
+ `;
+}
+
+function renderPendingPullRequestContext(agentKey, context) {
+ const lines = arrayValue(context.lines);
+ const first = lines[0] || {};
+ const last = lines[lines.length - 1] || first;
+ const firstNumber = first.new_number || first.old_number || "?";
+ const lastNumber = last.new_number || last.old_number || firstNumber;
+ const range = firstNumber === lastNumber ? `line ${firstNumber}` : `lines ${firstNumber}–${lastNumber}`;
+ const current = state.pullRequestDiffs[pullRequestDiffKey(agentKey, context.pull_request_id)];
+ const stale = current?.snapshot_id && current.snapshot_id !== context.snapshot_id;
+ const side = new Set(lines.map((line) => line.side)).size === 1 ? first.side : "mixed sides";
+ return `
+
+ ${iconSvg("code")}
+
+ ${escapeHtml(`${context.repository}${context.number ? `#${context.number}` : ""} · ${first.path || "diff"}`)}
+ ${escapeHtml(`${range} · ${side} · ${lines.length} selected${stale ? " · outdated; remove and reattach" : ""}`)}
+ ${context.comment ? `` : ""}
+
+
+
+ `;
+}
+
function renderPendingAttachment(agentKey, attachment) {
const preview = attachment.previewUrl
? `
})
`
@@ -7483,7 +8617,7 @@ function renderPendingAttachment(agentKey, attachment) {
`;
}
-function pendingPromptMessageBlock(agentKey, prompt, attachments = []) {
+function pendingPromptMessageBlock(agentKey, prompt, attachments = [], pullRequestContexts = []) {
const metadataAttachments = attachments.map((attachment) => ({
title: attachment.filename,
target: attachment.filename,
@@ -7499,7 +8633,15 @@ function pendingPromptMessageBlock(agentKey, prompt, attachments = []) {
content: prompt,
created_at: new Date().toISOString(),
pending: true,
- metadata: metadataAttachments.length ? { attachments: metadataAttachments } : {},
+ metadata: {
+ ...(metadataAttachments.length ? { attachments: metadataAttachments } : {}),
+ ...(pullRequestContexts.length ? { pull_request_contexts: pullRequestContexts.map((context) => ({
+ repository: context.repository,
+ number: context.number,
+ path: context.lines?.[0]?.path,
+ line_count: arrayValue(context.lines).length,
+ })) } : {}),
+ },
};
}
@@ -8344,20 +9486,31 @@ function highlightedCodeHtml(text, language) {
function renderCodeRoute(language) {
const route = parseRoute();
- if (route.type === "agent" || route.type === "agentSummary" || route.type === "agentAttachment") {
+ if (route.type === "agent") {
state.renderedViewHtml = "";
render();
return;
}
- if (route.type !== "attachment") return;
- const attachment = state.attachmentDetails[route.id] || attachmentById(route.id);
+ if (route.type !== "attachment" && route.type !== "agentAttachment") return;
+ const attachmentId = route.type === "agentAttachment" ? route.attachmentId : route.id;
+ const attachment = state.attachmentDetails[attachmentId] || attachmentById(attachmentId);
if (!attachment || attachmentKind(attachment) !== "file") return;
if (attachmentFormat(attachment) !== "text") return;
if (language && codeLanguageForAttachment(attachment) !== language) return;
- state.renderedViewHtml = "";
- render();
+ const viewer = els.view.querySelector(".attachment-code-viewer");
+ if (!viewer) return;
+ const template = document.createElement("template");
+ template.innerHTML = renderCodeAttachment(attachment.content, attachment);
+ const replacement = template.content.firstElementChild;
+ if (replacement) {
+ const scrollTop = viewer.scrollTop;
+ const scrollLeft = viewer.scrollLeft;
+ viewer.replaceWith(replacement);
+ replacement.scrollTop = scrollTop;
+ replacement.scrollLeft = scrollLeft;
+ }
}
function openAttachmentLinkOnce(id, href) {
@@ -8370,9 +9523,16 @@ function openAttachmentLinkOnce(id, href) {
function renderMarkdown(text, options = {}) {
const source = String(text || "");
if (markdownParserReady()) return renderParsedMarkdown(source, options);
+ if (markdownParser.failed) return renderPlainTextMarkdown(source, options);
ensureMarkdownParserLoaded();
- return renderPlainTextMarkdown(source, options);
+ state.markdownFallbackSequence += 1;
+ const fallbackKey = `markdown-fallback:${state.markdownFallbackSequence}`;
+ while (state.markdownFallbacks.size >= MARKDOWN_FALLBACK_LIMIT) {
+ state.markdownFallbacks.delete(state.markdownFallbacks.keys().next().value);
+ }
+ state.markdownFallbacks.set(fallbackKey, { source, options: { ...options } });
+ return renderPlainTextMarkdown(source, { ...options, fallbackKey });
}
function markdownParserReady() {
@@ -8393,6 +9553,7 @@ function ensureMarkdownParserLoaded() {
return true;
}).catch((error) => {
markdownParser.failed = true;
+ state.markdownFallbacks.clear();
console.warn("Markdown parser load failed", error);
return false;
});
@@ -8426,23 +9587,16 @@ function loadExternalScript(src) {
}
function renderMarkdownRoute() {
- const route = parseRoute();
- if (route.type === "agent" || route.type === "agentSummary" || route.type === "agentAttachment") {
- state.renderedViewHtml = "";
- render();
- return;
- }
-
- if (route.type !== "attachment" && route.type !== "agentAttachment") return;
-
- const attachmentId = route.type === "agentAttachment" ? route.attachmentId : route.id;
- const attachment = state.attachmentDetails[attachmentId] || attachmentById(attachmentId);
- if (!attachment || attachmentKind(attachment) !== "file") return;
- const format = String(attachment.format || attachmentFormat(attachment)).toLowerCase();
- if (format !== "markdown") return;
+ els.view.querySelectorAll("[data-markdown-fallback-key]").forEach((element) => {
+ const fallbackKey = element.dataset.markdownFallbackKey;
+ const fallback = state.markdownFallbacks.get(fallbackKey);
+ if (!fallback) return;
- state.renderedViewHtml = "";
- render();
+ element.outerHTML = renderParsedMarkdown(fallback.source, fallback.options);
+ state.markdownFallbacks.delete(fallbackKey);
+ });
+ state.markdownFallbacks.clear();
+ queueMermaidRendering();
}
function renderParsedMarkdown(text, options = {}) {
@@ -8570,7 +9724,8 @@ function markMermaidError(node, source) {
function renderPlainTextMarkdown(text, options = {}) {
const className = String(options.fallbackClassName || "attachment-text-viewer").trim() || "attachment-text-viewer";
const emptyText = Object.prototype.hasOwnProperty.call(options, "emptyText") ? options.emptyText : "No content";
- return `
${escapeHtml(text || emptyText)}`;
+ const fallbackKey = options.fallbackKey ? ` data-markdown-fallback-key="${escapeAttr(options.fallbackKey)}"` : "";
+ return `
${escapeHtml(text || emptyText)}`;
}
function markdownViewerClassName(options = {}) {
@@ -8878,7 +10033,11 @@ function setHeaderSubtitle(text) {
function renderHeaderSubtitle() {
const value = state.headerSubtitle;
const icon = state.refreshing ? iconSvg("hourglass") : iconSvg(state.headerSubtitleIcon);
- const className = state.refreshing ? "subtitle-status subtitle-refresh" : "subtitle-status";
+ const className = [
+ "subtitle-status",
+ state.refreshing ? "subtitle-refresh" : "",
+ value.startsWith("Conversation poll paused") ? "subtitle-polling-paused" : "",
+ ].filter(Boolean).join(" ");
els.subtitle.innerHTML = `
${icon}${escapeHtml(value)}`;
}
@@ -9836,9 +10995,10 @@ function responseStyleSourceLabel(source) {
}[String(source || "").toLowerCase()] || "Disabled";
}
-function setConnection(text) {
+function setConnection(text, options = {}) {
state.connection = text;
state.refreshing = text === "Refreshing";
+ if (options.preserveHeaderSubtitle) return;
if (state.refreshing) {
renderHeaderSubtitle();
} else {
@@ -9932,6 +11092,13 @@ function onScroll() {
window.requestAnimationFrame(handleScrollDirection);
}
+function notePullRequestDiffScrollIntent(event) {
+ if (!event.isTrusted || !els.view.querySelector("[data-pr-diff-viewer]")) return;
+ if (event.type === "keydown" && !["ArrowDown", "ArrowUp", "End", "Home", "PageDown", "PageUp", " "].includes(event.key)) return;
+
+ state.pullRequestDiffUserScrollGeneration += 1;
+}
+
function findAgent(key) {
const listAgent = state.agents.find((agent) => agent.key === key) || null;
const detailAgent = state.agentDetails[key] ||
@@ -11550,7 +12717,63 @@ els.authPanel.addEventListener("submit", (event) => {
els.saveToken.addEventListener("click", () => withPendingForm(els.authPanel, saveRemoteToken));
els.view.addEventListener("click", (event) => {
+ const prDiffNavigation = event.target.closest(".pr-diff-nav-item[data-agent-key][data-pull-request-id]");
+ if (prDiffNavigation && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
+ event.preventDefault();
+ cacheVisiblePullRequestDiffViewer();
+ showNav();
+ navigate({
+ type: "agentPullRequests",
+ key: prDiffNavigation.dataset.agentKey,
+ pullRequestId: prDiffNavigation.dataset.pullRequestId,
+ });
+ return;
+ }
showNav();
+ const prDiffLine = event.target.closest("[data-select-pr-diff-line]");
+ if (prDiffLine) {
+ event.preventDefault();
+ selectPullRequestDiffLine(prDiffLine, event.shiftKey);
+ return;
+ }
+ const attachPrDiffSelection = event.target.closest("[data-attach-pr-diff-selection]");
+ if (attachPrDiffSelection) {
+ attachSelectedPullRequestLines(
+ attachPrDiffSelection.dataset.agentKey,
+ attachPrDiffSelection.dataset.pullRequestId
+ );
+ return;
+ }
+ const sendPrDiffComment = event.target.closest("[data-send-pr-diff-comment]");
+ if (sendPrDiffComment) {
+ sendSelectedPullRequestComment(
+ sendPrDiffComment.dataset.agentKey,
+ sendPrDiffComment.dataset.pullRequestId
+ );
+ return;
+ }
+ const openPrContextComposer = event.target.closest("[data-open-pr-context-composer]");
+ if (openPrContextComposer) {
+ const agentKey = openPrContextComposer.dataset.openPrContextComposer;
+ const focusedComposer = document.querySelector(`#composer[data-agent-key="${CSS.escape(agentKey)}"]`)?.closest("details.focused-composer");
+ if (focusedComposer) focusedComposer.open = true;
+ document.querySelector(`#composer[data-agent-key="${CSS.escape(agentKey)}"] #prompt-input`)?.focus({ preventScroll: true });
+ syncAgentDockLayout();
+ return;
+ }
+ const clearPrDiffSelection = event.target.closest("[data-clear-pr-diff-selection]");
+ if (clearPrDiffSelection) {
+ clearPullRequestDiffSelection(
+ clearPrDiffSelection.dataset.agentKey,
+ clearPrDiffSelection.dataset.pullRequestId
+ );
+ return;
+ }
+ const removePrContext = event.target.closest("[data-remove-pr-context]");
+ if (removePrContext) {
+ removePendingPullRequestContext(removePrContext.dataset.agentKey, removePrContext.dataset.removePrContext);
+ return;
+ }
if (event.target.closest("[data-start-github-login]")) {
startGitHubLogin();
return;
@@ -12412,6 +13635,7 @@ els.view.addEventListener("keydown", (event) => {
});
document.addEventListener("keydown", handleFullScreenComposerKeydown, true);
+document.addEventListener("keydown", handlePullRequestSelectionEscape, true);
document.addEventListener("input", deferPollAfterFormInput, true);
els.view.addEventListener("paste", (event) => {
@@ -12427,6 +13651,21 @@ document.addEventListener("dragend", clearComposerDropTargets);
document.addEventListener("drop", clearComposerDropTargets);
els.view.addEventListener("input", (event) => {
+ if (event.target.matches("[data-pr-context-comment]")) {
+ const diff = state.pullRequestDiffs[pullRequestDiffKey(
+ event.target.dataset.agentKey,
+ event.target.dataset.pullRequestId
+ )];
+ const selection = pullRequestDiffSelection(
+ event.target.dataset.agentKey,
+ event.target.dataset.pullRequestId,
+ diff?.snapshot_id || ""
+ );
+ selection.comment = event.target.value;
+ event.target.closest("[data-pr-inline-comment]")?.querySelectorAll("[data-attach-pr-diff-selection], [data-send-pr-diff-comment]")
+ .forEach((button) => { button.disabled = !event.target.value.trim(); });
+ return;
+ }
if (event.target.matches("[data-review-filter]")) {
state.pullRequestFilters.query = event.target.value;
renderPullRequestInbox();
@@ -12740,19 +13979,39 @@ els.view.addEventListener("submit", (event) => {
const key = button?.dataset.agentKey || form.dataset.agentKey;
const promptValue = form.querySelector("#prompt-input")?.value.trim() || "";
const pendingAttachments = pendingAttachmentsFor(key);
- const prompt = promptValue || (pendingAttachments.length ? "Please review the attached files." : "");
+ const submittedPullRequestContexts = pendingPullRequestContextsFor(key).map((context) => ({
+ ...context,
+ lines: arrayValue(context.lines).map((line) => ({ ...line })),
+ }));
+ const prompt = promptValue || (pendingAttachments.length
+ ? "Please review the attached files."
+ : submittedPullRequestContexts.length ? "Please review the attached pull request context." : "");
if (!key || !prompt) return;
state.fullScreenComposerKeys.delete(key);
schedule();
closeSkillFlyout();
setComposerSending(form, true);
clearFormDraft(form);
- const pendingMessageId = addPendingConversationMessage(key, pendingPromptMessageBlock(key, prompt, pendingAttachments));
+ const pendingMessageId = addPendingConversationMessage(
+ key,
+ pendingPromptMessageBlock(key, prompt, pendingAttachments, submittedPullRequestContexts)
+ );
mutate(async () => {
const attachments = await pendingAttachmentPayloads(key);
- await apiPost(`/agents/${encodeURIComponent(key)}/messages`, { prompt, start: true, attachments });
+ const pullRequestContexts = submittedPullRequestContexts.map((context) => ({
+ ...promptPullRequestContextPayload(context, { includeComment: true }),
+ }));
+ await apiPost(`/agents/${encodeURIComponent(key)}/messages`, {
+ prompt,
+ start: true,
+ attachments,
+ pull_request_contexts: pullRequestContexts,
+ });
removePendingConversationMessage(key, pendingMessageId, { render: false });
clearPendingAttachments(key);
+ const submittedIds = new Set(submittedPullRequestContexts.map((context) => context.id));
+ state.pendingPullRequestContexts[key] = pendingPullRequestContextsFor(key)
+ .filter((context) => !submittedIds.has(context.id));
}, { form }).finally(() => {
setComposerSending(form, false);
removePendingConversationMessage(key, pendingMessageId);
@@ -13047,10 +14306,14 @@ async function refreshAgentPullRequests(agentKey) {
if (!agentKey) return;
try {
- setConnection("Refreshing pull requests");
- await ensureAgentPullRequests(agentKey, true);
+ setConnection("Refreshing PR metadata");
+ const data = await apiPost(`/agents/${encodeURIComponent(agentKey)}/pull-requests/metadata/refresh`);
+ state.pullRequests[agentKey] = { loading: false, items: data.pull_requests || [] };
state.renderedViewHtml = "";
- setConnection("Pull requests refreshed");
+ const failures = Array.isArray(data.failed) ? data.failed.length : 0;
+ setConnection(failures
+ ? `PR metadata refreshed with ${failures} failure${failures === 1 ? "" : "s"}`
+ : "PR metadata refreshed");
render();
} catch (error) {
setConnection(error.message);
@@ -13098,11 +14361,25 @@ async function refreshAllPullRequestDiffs(agentKey) {
try {
setConnection("Fetching PR diffs");
const data = await apiPost(`/agents/${encodeURIComponent(agentKey)}/pull-requests/refresh`);
- (data.refreshed || []).forEach((diff) => {
+ const route = parseRoute();
+ const selectedId = route.type === "agentPullRequests" && route.key === agentKey
+ ? selectedPullRequestId(agentKey, route.pullRequestId)
+ : "";
+ const selectedKey = selectedId ? pullRequestDiffKey(agentKey, selectedId) : "";
+ const selectedDiff = selectedKey ? state.pullRequestDiffs[selectedKey] : null;
+ const refreshed = Array.isArray(data.refreshed) ? data.refreshed : [];
+ refreshed.sort((left, right) => Number(left?.id === selectedId) - Number(right?.id === selectedId));
+ refreshed.forEach((diff) => {
if (!diff?.id) return;
- state.pullRequestDiffs[pullRequestDiffKey(agentKey, diff.id)] = diff;
+ const key = pullRequestDiffKey(agentKey, diff.id);
+ state.pullRequestDiffs[key] = diff;
+ rememberPullRequestDiffData(key);
});
+ if (selectedDiff && !refreshed.some((diff) => diff?.id === selectedId)) {
+ state.pullRequestDiffs[selectedKey] = selectedDiff;
+ rememberPullRequestDiffData(selectedKey);
+ }
await ensureAgentPullRequests(agentKey, true);
const failures = Array.isArray(data.failed) ? data.failed.length : 0;
setConnection(failures ? `PR diffs refreshed with ${failures} failure${failures === 1 ? "" : "s"}` : "PR diffs refreshed");
@@ -14018,6 +15295,7 @@ function scrollAgentConversationToBottom() {
}
window.addEventListener("hashchange", () => {
+ if (state.speechRecognition) stopSpeechMode({ immediate: true });
saveAgentShellFormDrafts();
state.fullScreenComposerKeys.clear();
state.fullScreenInquiryKeys.clear();
@@ -14025,11 +15303,16 @@ window.addEventListener("hashchange", () => {
closeUnreadPanel();
state.lastScrollY = window.scrollY;
showNav();
+ resetPullRequestDiffRender();
render();
ensureRouteData({ forceConversation: true, forceProject: true }).then(render).catch((error) => setConnection(error.message));
});
window.addEventListener("scroll", onScroll, { passive: true });
+window.addEventListener("wheel", notePullRequestDiffScrollIntent, { capture: true, passive: true });
+window.addEventListener("touchmove", notePullRequestDiffScrollIntent, { capture: true, passive: true });
+window.addEventListener("pointerdown", notePullRequestDiffScrollIntent, { capture: true, passive: true });
+window.addEventListener("keydown", notePullRequestDiffScrollIntent, true);
window.addEventListener("focusin", () => {
showNav();
@@ -14056,7 +15339,7 @@ document.addEventListener("visibilitychange", () => {
state.failureCount = 0;
state.lastScrollY = window.scrollY;
showNav();
- refresh({ force: true });
+ refresh({ force: true, preserveFocusedWorkspace: true });
} else {
flushComposerDraftSaves();
}
@@ -14572,6 +15855,16 @@ if (els.confirmationDialog) {
document.addEventListener("keydown", (event) => {
if (shortcutModifierKey(event)) setShortcutModifierActive(true);
+ if (event.key === "Escape" && state.speechRecognition) {
+ event.preventDefault();
+ stopSpeechMode({ cancel: true });
+ return;
+ }
+ if (event.key === "Escape" && clearActivePullRequestDiffSelection()) {
+ event.preventDefault();
+ return;
+ }
+
if (handleSpeechModeShortcut(event)) return;
if (handleAttachmentFlyoutKeydown(event)) return;
diff --git a/test/managed_agent_test.rb b/test/managed_agent_test.rb
index 6a169f1..9c36ee3 100644
--- a/test/managed_agent_test.rb
+++ b/test/managed_agent_test.rb
@@ -15,6 +15,7 @@ def run!
assert_new_agents_use_unique_log_stems
assert_lifetime_run_count_survives_retained_window
assert_completed_status_overrides_live_pid
+ assert_structured_result_status_overrides_transport_exit
assert_start_finalizes_unpolled_previous_run
assert_cli_status_finalizes_unpolled_dead_pid
assert_start_reconciles_session_after_restart
@@ -100,6 +101,43 @@ def assert_lifetime_run_count_survives_retained_window
end
end
+ def assert_structured_result_status_overrides_transport_exit
+ run = HQ::ManagedAgent::AgentRun.new(
+ started_at: Time.utc(2026, 8, 10, 1),
+ finished_at: Time.utc(2026, 8, 10, 1, 1),
+ exit_code: 1,
+ status: "partial"
+ )
+ agent = HQ::ManagedAgent.new(
+ key: "structured-status-agent",
+ name: "Structured status",
+ project_key: "demo",
+ template_key: "custom",
+ workspace: Dir.tmpdir,
+ prompt: "Prompt",
+ last_exit_code: 1,
+ runs: [run],
+ structured_result: { "status" => "partial", "summary" => "Work is ready; CI is flaky." }
+ )
+
+ assert(agent.status == "partial",
+ "expected a validated structured result to prevent a transport exit from rendering as failed")
+
+ agent.structured_result = { "status" => "success", "summary" => "Completed." }
+ assert(agent.status == "succeeded",
+ "expected a successful structured result to override a nonzero transport exit")
+
+ agent.structured_result = { "status" => "failed", "summary" => "Validation failed." }
+ agent.instance_variable_set(:@last_exit_code, 0)
+ assert(agent.status == "failed",
+ "expected an explicitly failed structured result to override a zero transport exit")
+
+ agent.structured_result = { "status" => "success", "summary" => "Stopped after completion." }
+ agent.instance_variable_set(:@last_exit_code, 143)
+ assert(agent.status == "stopped",
+ "expected an explicit stop exit to remain a lifecycle state despite a structured result")
+ end
+
def assert_completed_run_persists_cost_snapshot
Dir.mktmpdir("hq-managed-agent-cost-snapshot-test") do |dir|
started_at = Time.utc(2026, 7, 22, 10, 0, 0)
@@ -1504,10 +1542,26 @@ def assert_external_process_environment_removes_ruby_loader_state
env = agent.send(:external_process_environment, "BUNDLE_GEMFILE" => "/custom/Gemfile", "CUSTOM" => "1")
assert(env["BUNDLE_BIN_PATH"].nil?, "expected Bundler bin path to be cleared for harnesses")
+ assert(env.key?("BUNDLER_SETUP") && env["BUNDLER_SETUP"].nil?,
+ "expected Bundler setup hook to be cleared for harnesses")
assert(env["RUBYOPT"].nil?, "expected Ruby loader options to be cleared for harnesses")
assert(env["GEM_HOME"].nil?, "expected Ruby gem home to be cleared for harnesses")
assert(env["BUNDLE_GEMFILE"] == "/custom/Gemfile", "expected explicit harness env to remain authoritative")
assert(env["CUSTOM"] == "1", "expected explicit harness env to be preserved")
+
+ runner_output = IO.popen(
+ agent.send(:external_process_environment, {}),
+ [
+ RbConfig.ruby,
+ "-I", File.expand_path("../lib", __dir__),
+ "-r", "hq/domain/agent_correction_runner",
+ "-e", 'STDOUT.write("runner-loaded")'
+ ],
+ err: %i[child out],
+ &:read
+ )
+ assert($?.success? && runner_output == "runner-loaded",
+ "expected sanitized environment to execute the correction runner, got #{runner_output.inspect}")
end
def assert_start_spawns_harness_through_validation_runner
diff --git a/test/pull_request_diff_test.rb b/test/pull_request_diff_test.rb
index be6cb30..f4c9b11 100644
--- a/test/pull_request_diff_test.rb
+++ b/test/pull_request_diff_test.rb
@@ -45,6 +45,7 @@ def run!
assert_freshness_separates_code_and_activity
assert_snapshot_identity_omits_agent_key
assert_store_preserves_concurrent_snapshots
+ assert_store_reuses_and_invalidates_document_cache
puts "pull_request_diff_test: ok"
end
@@ -135,6 +136,26 @@ def assert_store_preserves_concurrent_snapshots
end
end
+ def assert_store_reuses_and_invalidates_document_cache
+ Dir.mktmpdir("tycho-pr-diff-cache") do |dir|
+ path = File.join(dir, "snapshots.json")
+ store = HQ::PullRequestDiff::Store.new(path)
+ store.save("id" => "first", "snapshot_id" => "first-snapshot")
+ first_read = store.all
+ assert(store.all.equal?(first_read), "expected unchanged snapshot files to reuse the parsed document")
+ assert(first_read.frozen? && first_read.fetch("first").frozen?, "expected cached snapshots to be immutable")
+ begin
+ first_read.fetch("first")["snapshot_id"] = "mutated"
+ rescue FrozenError
+ nil
+ end
+ assert(store.fetch("first")["snapshot_id"] == "first-snapshot", "expected callers not to mutate cached snapshots")
+
+ HQ::PullRequestDiff::Store.new(path).save("id" => "second", "snapshot_id" => "second-snapshot")
+ assert(store.all.keys.sort == %w[first second], "expected external snapshot writes to invalidate the parsed document")
+ end
+ end
+
def reference_for(agent_key: nil)
HQ::PullRequestDiff::Reference.new(
id: HQ::PullRequestDiff.reference_id("github", "example/web", 123),
diff --git a/test/remote_server_test.rb b/test/remote_server_test.rb
index 87813c7..6e11498 100644
--- a/test/remote_server_test.rb
+++ b/test/remote_server_test.rb
@@ -26,10 +26,12 @@ def run!
assert_remote_inquiry_payload_has_stable_id_and_guarded_answer
assert_remote_agent_payload_includes_attachments
assert_remote_agent_pull_request_diff_payload
+ assert_agent_pull_request_listing_avoids_eager_metadata_requests
assert_concurrent_pull_request_diff_refreshes_are_coalesced
assert_pull_request_review_refresh_reuses_metadata
assert_pull_request_feature_gate_and_global_inbox
assert_pull_request_line_handoff_uses_snapshot_context
+ assert_remote_prompt_accepts_pull_request_context
assert_github_app_auth_routes
assert_pull_request_posting_is_confirmed_stale_safe_and_idempotent
assert_remote_prompt_accepts_uploaded_attachments
@@ -932,8 +934,10 @@ def assert_remote_agent_pull_request_diff_payload
reference = payload.first
assert(reference["repository"] == "example/web", "expected GitHub repository to be parsed")
assert(reference["number"] == 123, "expected GitHub PR number to be parsed")
- assert(reference["error"].to_s.length.positive?,
- "expected metadata errors to be reported without hiding PR references")
+ assert(reference["error"].nil?, "expected ordinary PR listing to avoid unavailable GitHub metadata")
+ metadata_refresh = service.refresh_agent_pull_request_metadata(created[:key])
+ assert(metadata_refresh[:failed].length == 1,
+ "expected explicit metadata refresh errors to be reported without hiding PR references")
snapshot = {
"id" => reference["id"],
@@ -942,7 +946,9 @@ def assert_remote_agent_pull_request_diff_payload
"repository" => "example/web",
"number" => 123,
"url" => "https://github.com/example/web/pull/123",
- "title" => "Example PR",
+ "title" => "Origin PR title",
+ "state" => "open",
+ "draft" => true,
"head_sha" => "abc1234",
"base_sha" => "def5678",
"fetched_at" => Time.now.iso8601,
@@ -964,6 +970,13 @@ def assert_remote_agent_pull_request_diff_payload
}
HQ::PullRequestDiff::Store.new.save(snapshot)
+ listed_from_snapshot = service.agent_pull_requests(created[:key]).first
+ assert(listed_from_snapshot["title"] == "Origin PR title" &&
+ listed_from_snapshot["state"] == "open" && listed_from_snapshot["draft"] == true,
+ "expected saved origin metadata to backfill the agent PR catalog and listing")
+ assert(!listed_from_snapshot.fetch("snapshot").key?("fresh"),
+ "expected snapshot-seeded metadata to leave remote freshness unknown")
+
diff = service.agent_pull_request_diff(created[:key], reference["id"])
assert(diff["files"].first["path"] == "lib/example.rb", "expected saved PR diff snapshot to be returned")
@@ -973,26 +986,157 @@ def assert_remote_agent_pull_request_diff_payload
end
end
+ def assert_agent_pull_request_listing_avoids_eager_metadata_requests
+ with_remote_temp_store do |dir|
+ workspace = File.join(dir, "workspace")
+ write_project_workspace(workspace)
+ registry = registry_for_project(dir, workspace)
+ client = FakeGitHubReviewClient.new
+ snapshot_store = CountingPullRequestDiffStore.new(File.join(dir, "diffs.json"))
+ service = HQ::RemoteService.new(registry:, github_client: client, pull_request_diff_store: snapshot_store)
+ created = service.create_agent(
+ "project_key" => "web",
+ "template_key" => "custom",
+ "name" => "Many pull requests",
+ "prompt" => "Review pull requests.",
+ "agent" => "codex"
+ )
+ agent = HQ::AgentStore.new(registry.projects).load.find { |item| item.key == created[:key] }
+ memory = HQ::AgentMemory.new(agent)
+ 3.times do |index|
+ memory.append_attachment!(
+ {
+ "kind" => "link",
+ "title" => "PR #{index + 1}",
+ "url" => "https://github.com/example/web/pull/#{index + 1}"
+ },
+ created_at: Time.parse("2026-08-09 13:00:0#{index}")
+ )
+ end
+
+ listed = service.agent_pull_requests(created[:key])
+ metadata_requests = client.requests.count { |kind, path| kind == :get_json && path.include?("/pulls/") }
+
+ assert(listed.length == 3, "expected every attached pull request to be listed")
+ assert(metadata_requests.zero?,
+ "expected ordinary PR listing to avoid one blocking GitHub metadata request per pull request")
+ assert(snapshot_store.all_calls == 1,
+ "expected ordinary PR listing to parse the shared diff snapshot store only once")
+
+ server = HQ::RemoteServer.new
+ response = server.send(
+ :route,
+ service,
+ "POST",
+ "/agents/#{created[:key]}/pull-requests/metadata/refresh",
+ {},
+ nil
+ )
+ refreshed = response[:body]
+ metadata_requests = client.requests.count { |kind, path| kind == :get_json && path.include?("/pulls/") }
+ assert(metadata_requests == 3, "expected explicit metadata refresh to request each pull request once")
+ assert(refreshed[:pull_requests].all? { |item| item["title"] == "Shared PR" },
+ "expected refreshed GitHub metadata to be returned from the persistent catalog")
+ assert(refreshed[:pull_requests].all? { |item| item["metadata_refreshed_at"].to_s.length.positive? },
+ "expected cached PR metadata to expose its refresh time")
+ catalog = JSON.parse(File.read(agent.pull_request_catalog_path))
+ assert(catalog.fetch("entries").length == 3,
+ "expected newly discovered pull requests to be persisted in the agent-owned PR catalog")
+ assert(!File.exist?(File.join(HQ::AGENT_LOGS_DIR, "pull_request_catalog.json")),
+ "expected agent PR listing to avoid a shared cross-agent catalog")
+
+ second_created = service.create_agent(
+ "project_key" => "web",
+ "template_key" => "custom",
+ "name" => "Other pull requests",
+ "prompt" => "Review another list.",
+ "agent" => "codex"
+ )
+ second_agent = HQ::AgentStore.new(registry.projects).load.find { |item| item.key == second_created[:key] }
+ HQ::AgentMemory.new(second_agent).append_attachment!(
+ {
+ "kind" => "link",
+ "title" => "Other PR",
+ "url" => "https://github.com/other/repository/pull/99"
+ },
+ created_at: Time.parse("2026-08-09 13:01:00")
+ )
+ requests_before_second_list = client.requests.length
+ second_list = service.agent_pull_requests(second_created[:key])
+ second_catalog = JSON.parse(File.read(second_agent.pull_request_catalog_path))
+ assert(second_list.length == 1 && client.requests.length == requests_before_second_list,
+ "expected another agent's PR list to remain network-free")
+ assert(second_agent.pull_request_catalog_path != agent.pull_request_catalog_path,
+ "expected each agent to own a distinct PR catalog path")
+ assert(second_catalog.fetch("entries").length == 1 && catalog.fetch("entries").length == 3,
+ "expected one agent's PR discovery to stay isolated from every other catalog")
+
+ restarted = HQ::RemoteService.new(registry:, github_client: FakeUnavailableGitHubClient.new)
+ cached = restarted.agent_pull_requests(created[:key])
+ assert(cached.length == 3 && cached.all? { |item| item["title"] == "Shared PR" },
+ "expected PR references and metadata to survive a Remote server restart")
+
+ catalog_paths = [
+ agent.pull_request_catalog_path,
+ "#{agent.pull_request_catalog_path}.bak",
+ "#{agent.pull_request_catalog_path}.lock"
+ ]
+ archive = agent.archive_logs!(File.join(dir, "archive"))
+ assert(catalog_paths.all? { |path| File.exist?(File.join(archive, File.basename(path))) },
+ "expected agent archive to move the PR catalog, backup, and lock sidecars")
+ assert(catalog_paths.none? { |path| File.exist?(path) },
+ "expected agent archive to leave no active PR catalog sidecars behind")
+ end
+ end
+
def assert_concurrent_pull_request_diff_refreshes_are_coalesced
with_remote_temp_store do |dir|
workspace = File.join(dir, "workspace")
write_project_workspace(workspace)
client = BlockingGitHubDiffClient.new
+ registry = registry_for_project(dir, workspace)
service = HQ::RemoteService.new(
- registry: registry_for_project(dir, workspace),
+ registry:,
github_client: client,
pull_request_diff_store: HQ::PullRequestDiff::Store.new(File.join(dir, "diffs.json"))
)
- reference = HQ::PullRequestDiff.reference_from_url("https://github.com/example/web/pull/123")
- first = Thread.new { service.send(:refresh_pull_request_snapshot, reference) }
+ agents = 2.times.map do |index|
+ created = service.create_agent(
+ "project_key" => "web",
+ "template_key" => "custom",
+ "name" => "Shared PR agent #{index + 1}",
+ "prompt" => "Review the shared PR.",
+ "agent" => "codex"
+ )
+ agent = HQ::AgentStore.new(registry.projects).load.find { |item| item.key == created[:key] }
+ HQ::AgentMemory.new(agent).append_attachment!(
+ {
+ "kind" => "link",
+ "title" => "Shared PR",
+ "url" => "https://github.com/example/web/pull/123"
+ },
+ created_at: Time.parse("2026-08-09 13:02:0#{index}")
+ )
+ agent
+ end
+ references = agents.map { |agent| HQ::PullRequestDiff.references_for_agent(agent).fetch(0) }
+ first = Thread.new { service.send(:refresh_pull_request_snapshot, references.fetch(0)) }
client.metadata_started.pop
- second = Thread.new { service.send(:refresh_pull_request_snapshot, reference) }
+ second = Thread.new { service.send(:refresh_pull_request_snapshot, references.fetch(1)) }
+
+ deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + 2
+ Thread.pass until second.status == "sleep" || Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
+ follower_waiting = second.status == "sleep"
client.release!
[first, second].each(&:value)
+ assert(follower_waiting, "expected the second agent refresh to join the in-flight PR fetch")
assert(client.metadata_requests == 1 && client.diff_requests == 1,
"expected concurrent identical diff refreshes to share one metadata and diff fetch")
+ catalogs = agents.map { |agent| JSON.parse(File.read(agent.pull_request_catalog_path)) }
+ assert(catalogs.all? { |catalog| catalog.dig("entries", references.first.id, "metadata", "title") == "Shared PR" },
+ "expected every coalesced caller to persist metadata in its own agent catalog")
end
end
@@ -1125,6 +1269,90 @@ def assert_pull_request_line_handoff_uses_snapshot_context
end
end
+ def assert_remote_prompt_accepts_pull_request_context
+ with_remote_temp_store do |dir|
+ workspace = File.join(dir, "workspace")
+ write_project_workspace(workspace)
+ registry = registry_for_project(dir, workspace)
+ diff_store = HQ::PullRequestDiff::Store.new(File.join(dir, "composer-diffs.json"))
+ service = HQ::RemoteService.new(registry:, github_client: FakeGitHubReviewClient.new,
+ pull_request_diff_store: diff_store)
+ created = service.create_agent("project_key" => "web", "template_key" => "custom", "name" => "Composer",
+ "prompt" => "Work.", "agent" => "codex")
+ agent = HQ::AgentStore.new(registry.projects).load.find { |item| item.key == created[:key] }
+ HQ::AgentMemory.new(agent).append_attachment!(
+ { "kind" => "link", "title" => "PR", "url" => "https://github.com/example/web/pull/123" }
+ )
+ HQ::AgentStore.new(registry.projects).save([agent])
+ reference = HQ::PullRequestDiff.reference_from_url("https://github.com/example/web/pull/123")
+ diff_store.save(
+ "id" => reference.id, "snapshot_id" => "composer-snapshot", "provider" => "github",
+ "repository" => "example/web", "number" => 123, "base_sha" => "base", "head_sha" => "head",
+ "diff_format" => HQ::PullRequestDiff::DIFF_FORMAT,
+ "files" => [{ "path" => "lib/example.rb", "hunks" => [{ "lines" => [
+ { "kind" => "removed", "old_number" => 3, "content" => "old" },
+ { "kind" => "added", "new_number" => 4, "content" => "new" }
+ ] }] }]
+ )
+
+ result = service.submit_prompt(created[:key],
+ "prompt" => "Explain this range.",
+ "pull_request_contexts" => [{
+ "pull_request_id" => reference.id,
+ "snapshot_id" => "composer-snapshot",
+ "comment" => "Explain why these two sides differ.",
+ "lines" => [
+ { "path" => "lib/example.rb", "hunk_index" => 0, "line_index" => 0 },
+ { "path" => "lib/example.rb", "hunk_index" => 0, "line_index" => 1 }
+ ]
+ }])
+ content = result[:conversation].last[:content]
+ assert(content.start_with?("Explain this range.") && content.include?(HQ::PullRequestSelection::OPEN),
+ "expected normal composer messages to include validated PR context")
+ assert(content.include?('"path":"lib/example.rb"') && content.include?('"side":"left"') &&
+ content.include?('"side":"right"') && content.include?('"old_number":3') &&
+ content.include?('"new_number":4') &&
+ content.include?("Comment on this range:\nExplain why these two sides differ."),
+ "expected PR context to carry repository file, side, and line metadata")
+
+ begin
+ service.submit_prompt(created[:key],
+ "prompt" => "Oversized comment.",
+ "pull_request_contexts" => [{
+ "pull_request_id" => reference.id, "snapshot_id" => "composer-snapshot",
+ "comment" => "x" * ((8 * 1024) + 1),
+ "lines" => [{ "path" => "lib/example.rb", "hunk_index" => 0, "line_index" => 0 }]
+ }])
+ raise "expected oversized PR comment to fail"
+ rescue HQ::RemoteServer::Error => e
+ assert(e.status == 400 && e.message.include?("at most 8 KB"),
+ "expected oversized PR comments to return a bounded input error")
+ end
+
+ begin
+ asset_pattern = File.join(HQ::AGENT_LOGS_DIR, "assets", created[:key], "**", "*")
+ asset_files_before = Dir.glob(asset_pattern).select { |path| File.file?(path) }
+ service.submit_prompt(created[:key],
+ "prompt" => "Stale.",
+ "attachments" => [{
+ "filename" => "stale.txt", "mime_type" => "text/plain",
+ "content_base64" => Base64.strict_encode64("must not be imported")
+ }],
+ "pull_request_contexts" => [{
+ "pull_request_id" => reference.id, "snapshot_id" => "old",
+ "lines" => [{ "path" => "lib/example.rb", "hunk_index" => 0, "line_index" => 0 }]
+ }])
+ raise "expected stale composer PR context to fail"
+ rescue HQ::RemoteServer::Error => e
+ assert(e.status == 409 && e.message.include?("changed"),
+ "expected stale composer PR context to return an actionable conflict")
+ asset_files_after = Dir.glob(asset_pattern).select { |path| File.file?(path) }
+ assert(asset_files_after == asset_files_before,
+ "expected stale PR context validation to happen before uploaded files are written")
+ end
+ end
+ end
+
def assert_github_app_auth_routes
with_remote_temp_store do |dir|
workspace = File.join(dir, "workspace")
@@ -4874,7 +5102,7 @@ def assert_remote_ui_routes_load_without_auth
js[:body].include?("function liveEditorRefreshPlan") &&
js[:body].include?("function reconcileViewAroundEditor"),
"expected polling renders to reconcile around stable Conversation and inquiry forms")
- assert(js[:body].include?("replaceSiblingsAroundEditor") &&
+ assert(js[:body].include?("replaceSiblingsAroundAnchor") &&
js[:body].include?('data-agent-running="${agentIsRunning(agent) ? "true" : "false"}"'),
"expected live editor reconciliation to preserve controls without hiding real agent state transitions")
assert(js[:body].include?("scrollContainers"),
@@ -4893,12 +5121,18 @@ def assert_remote_ui_routes_load_without_auth
js[:body].include?("delete state.agentDetails[agent.key]"),
"expected catalog revision changes to invalidate stale agent attachment details")
assert(js[:body].include?("function preserveWorkspaceDuringPoll") &&
- js[:body].include?("if (options.force || options.forceAttachment) return false") &&
+ js[:body].include?("if (options.forceAttachment) return false") &&
+ js[:body].include?("if (options.force && !options.preserveFocusedWorkspace) return false") &&
+ js[:body].include?("function focusedWorkspacePreservedDuringPoll") &&
+ js[:body].include?("function focusedWorkspacePollingSubtitle") &&
+ js[:body].include?("Conversation poll paused") &&
+ js[:body].include?("function syncFocusedWorkspaceCatalog") &&
js[:body].include?('els.view.querySelector("#inquiry-form")') &&
js[:body].include?("if (preservedInquiryAgent) state.agentDetails[inquiryAgentKey] = preservedInquiryAgent") &&
- js[:body].include?("if (!preserveWorkspace) await ensureRouteData(options)") &&
- js[:body].scan("if (!preserveWorkspace)").length == 3,
- "expected automatic attachment and inquiry polling to update state without rendering the workspace")
+ js[:body].include?("const preserveCurrentWorkspace = routeChangedDuringRefresh || preserveWorkspaceDuringPoll(options)") &&
+ js[:body].include?("if (!preserveCurrentWorkspace) await ensureRouteData(options)") &&
+ js[:body].include?("syncFocusedWorkspaceCatalog(currentRoute)"),
+ "expected focused workspace polling to reconcile catalog state without fetching or rendering route data")
assert(js[:body].include?("state.preservePollContentDuringRender") &&
js[:body].include?("replaceViewContent(html)"),
"expected explicit attachment refreshes to replace preserved attachment content")
@@ -5362,7 +5596,8 @@ def assert_remote_ui_routes_load_without_auth
"expected Remote UI to clear the prompt before optimistic conversation rendering replaces the composer")
assert(js[:body].include?("pendingConversationMessages"),
"expected Remote UI to render optimistic pending chat messages")
- assert(js[:body].include?("await apiPost(`/agents/${encodeURIComponent(key)}/messages`, { prompt, start: true, attachments });\n removePendingConversationMessage(key, pendingMessageId, { render: false });"),
+ assert(js[:body].include?("pull_request_contexts: pullRequestContexts") &&
+ js[:body].include?("removePendingConversationMessage(key, pendingMessageId, { render: false });"),
"expected Remote UI to remove optimistic chat before refreshing server-backed conversation")
assert(js[:body].include?("loadingConversations"),
"expected Remote UI to track conversation loading per agent")
@@ -6176,6 +6411,20 @@ def release!
end
end
+ class CountingPullRequestDiffStore < HQ::PullRequestDiff::Store
+ attr_reader :all_calls
+
+ def initialize(path)
+ super
+ @all_calls = 0
+ end
+
+ def all
+ @all_calls += 1
+ super
+ end
+ end
+
class FakeUnavailableGitHubClient
def enabled?
true