restructure dashboard UI, add mode instructions, post-review follow-up dispatch (#453)

* add mode instructions and restructure dashboard sidebar - add modeInstructions JSONB field to Repo model for per-mode user instructions - thread modeInstructions through settings API, run-context API, RepoSettings, ToolContext, and selectMode runtime - merge user-defined mode instructions with hardcoded orchestrator guidance, with IncrementalReview inheriting from Review - reduce visible built-in modes from 7 to 4 (Build, Review, Plan, Fix) with editable Instructions textareas - add TRIGGERS group header to sidebar above Mentions, Pull requests, Issues - add wiki/modes.md documenting triggers and modes conceptual model Made-with: Cursor * fix leaping comment deletion and address review feedback - wrap post-createReview operations in try/finally so deleteProgressComment runs even when updateReview or reportReviewNodeId throws - add parseModeInstructions runtime guard to filter non-string values from the JSONB field before passing to buildOrchestratorGuidance - add useEffect sync for localInstructions when props change - guard onBlur to skip save when instructions haven't changed - update wiki/modes.md to reflect V2 is implemented (no longer "proposed") Made-with: Cursor * harden review cleanup, fix type cast, stabilize mode instructions state - wrap deleteProgressComment in try/catch inside finally to prevent masking original errors - replace `as Record<string,string>` cast with runtime parseModeInstructions + useMemo - fix wiki dual-prompt table to reflect mode.prompt fallback status Made-with: Cursor * fix wiki tense and heading ambiguity from PR review Made-with: Cursor * fix review "edited" badge by using pending review + submit flow create review as PENDING first (no event/body), build the footer with the now-known review ID, then submitReview with the full body. single atomic publish — no updateReview edit needed. Made-with: Cursor * add post-agent follow-up re-review dispatch After the agent exits, check if PR HEAD moved past the reviewed commit and dispatch a follow-up re-review. This closes the gap where push webhooks are suppressed during in-flight reviews. Made-with: Cursor * add silent flag to follow-up re-review dispatch Made-with: Cursor * restructure dashboard for consistency and clarity - consolidate tools into single grouped card (was 4 separate cards) - merge coding + autofix CI into one section - remove redundant trigger section descriptions - add bidirectional crosslinks between modes and triggers - inline instruction links (review/plan/build) into descriptions - add save status indicators to all sections - restructure flags with grouped built-in/custom cards - flatten sidebar (remove dividers and group headers) - tighten all descriptions Made-with: Cursor * update PR screenshots for new dashboard layout Made-with: Cursor * extend review context inline instead of dispatching new workflow when commits are pushed during a review, the agent now handles them inline: create_pull_request_review detects HEAD movement, returns instructions to pull and review the incremental diff, and the agent submits a second review covering only the new changes. this avoids the cost of spinning up a full new workflow run. also fixes a bug where reviewedSha was set to the submission HEAD (current) rather than the checkout HEAD (what was actually reviewed), which caused commits pushed between checkout and submission to be silently missed by postReviewCleanup. the workflow dispatch is kept as a safety net for agent timeout/error. Made-with: Cursor * polish dashboard UI: fix debug markers, crosslinks, title consistency, descriptions - remove all red debug borders/labels and CM component - remove all inline style={{}} debug outlines from crosslinks - fix ambiguous crosslinks: Build→"Coding ↓", Plan→"Enrich issues ↓" - add missing "Edit build instructions ↑" backlink on Auto-address reviews - normalize card title weight to text-sm font-semibold across all cards - rename "Default" subcard to "Setup" with broader description - fix Mentions description to imperative tone - broaden Flags section description to cover built-in and custom - remove useless fragments in ModesSection and ToolsSettings - restructure Agent section: remove ConsoleSection wrappers, add sidebar indent support Made-with: Cursor * extract PR quick links as standalone card, consistent with issues - PR quick links is now its own card under Reviews (was a sub-toggle inside Review PRs disabled state) - Review PRs OFF sets prCreated="none" instead of auto-falling back to "links" - Review PRs card hides sub-toggles when disabled (re-review/approve don't apply) - Both PRs and Issues now have identical Quick links card structure Made-with: Cursor * update reviews screenshot with standalone quick links card Made-with: Cursor * polish dashboard UI: revert quick links to inline toggles, fix fonts and spacing - revert standalone PR/issue Quick Links cards back to inline toggles inside Review PRs and Enrich Issues cards (fixes prCreated state coupling bug) - restore original font-medium card titles across all trigger/settings cards - fix sidebar: add CONSOLE heading, remove nested indentation, remove truncation - right-justify Enrich Issues mode dropdown, group description with label - move instructions links inline with behavior descriptions - replace text save indicators with icon spinner/checkmark - standardize section title spacing, move footer below danger zone Made-with: Cursor * fix formatting for biome lint Made-with: Cursor * address PR review feedback: cleanup guard, shared util, wiki update - clear ctx.toolState.review after read to prevent double-execution of postReviewCleanup - forward authorPermission in safety-net re-review dispatch - extract parseModeInstructions to utils/schemas/modeInstructions.ts - update wiki/modes.md: remove stale v1/v2 language, fix dashboard layout - add typecheck to pre-push hook Made-with: Cursor * add action typecheck to pre-push, fix exactOptionalPropertyTypes errors Made-with: Cursor * fix duplicate actuallyReviewedSha from rebase Made-with: Cursor * remove PR screenshots Made-with: Cursor * add label/textarea association for mode instruction accessibility Made-with: Cursor --------- Co-authored-by: Colin McDonnell <colinmcd94@gmail.com>
2026-03-11 04:24:09 +00:00
parent 089a05b13e
commit 5bcfae990a
13 changed files with 361 additions and 75 deletions
@@ -355,7 +355,6 @@ export function CheckoutPrTool(ctx: ToolContext) {
        postCheckoutScript: ctx.postCheckoutScript,
      });

-      // fetch PR metadata to return result
      const pr = await ctx.octokit.rest.pulls.get({
        owner: ctx.repo.owner,
        repo: ctx.repo.name,
@@ -367,6 +366,8 @@ export function CheckoutPrTool(ctx: ToolContext) {
        throw new Error(`PR #${pull_number} source repository was deleted`);
      }

+      ctx.toolState.checkoutSha = pr.data.head.sha;
+
      // fetch PR files and format with line numbers
      const formatResult = await fetchAndFormatPrDiff({
        octokit: ctx.octokit,
@@ -4,7 +4,6 @@ import { apiFetch } from "../utils/apiFetch.ts";
 import { getApiUrl } from "../utils/apiUrl.ts";
 import { buildPullfrogFooter } from "../utils/buildPullfrogFooter.ts";
 import { log } from "../utils/cli.ts";
-import { deleteProgressComment } from "./comment.ts";
 import type { ToolContext } from "./server.ts";
 import { execute, tool } from "./shared.ts";

@@ -81,7 +80,6 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
        event = "COMMENT";
      }

-      // compose the request
      const params: RestEndpointMethodTypes["pulls"]["createReview"]["parameters"] = {
        owner: ctx.repo.owner,
        repo: ctx.repo.name,
@@ -91,7 +89,6 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
      if (commit_id) {
        params.commit_id = commit_id;
      } else {
-        // get the PR to determine the head commit if commit_id not provided
        const pr = await ctx.octokit.rest.pulls.get({
          owner: ctx.repo.owner,
          repo: ctx.repo.name,
@@ -101,9 +98,7 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
      }
      if (comments.length > 0) {
        type ReviewComment = (typeof params.comments & {})[number];
-        // convert comments to the format expected by GitHub API
        params.comments = comments.map((comment) => {
-          // build comment body with suggestion block if provided
          let commentBody = comment.body || "";
          if (comment.suggestion !== undefined) {
            const suggestionBlock = "```suggestion\n" + comment.suggestion + "\n```";
@@ -139,12 +134,49 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
      const reviewId = result.data.id;
      const reviewNodeId = result.data.node_id;

-      // report review node ID to server so the in-flight dedup check
-      // in the synchronize webhook handler sees this run as "review submitted."
-      // awaited (not fire-and-forget) to guarantee the signal lands before
-      // any subsequent push's webhook checks for in-flight runs.
-      await reportReviewNodeId(ctx, reviewNodeId);
-      await deleteProgressComment(ctx);
+      // reviewedSha = what the agent actually reviewed (checkout SHA), not the
+      // submission anchor (current HEAD). this ensures postReviewCleanup dispatches
+      // a follow-up if the agent doesn't handle new commits inline.
+      const actuallyReviewedSha = ctx.toolState.checkoutSha ?? params.commit_id;
+      ctx.toolState.review = {
+        id: reviewId,
+        nodeId: reviewNodeId,
+        reviewedSha: actuallyReviewedSha,
+      };
+
+      // detect commits pushed since checkout and guide the agent to review them
+      // inline instead of dispatching a separate workflow run
+      const headMovedDuringReview =
+        ctx.toolState.checkoutSha && params.commit_id !== ctx.toolState.checkoutSha;
+
+      if (headMovedDuringReview) {
+        const fromSha = ctx.toolState.checkoutSha!;
+        const toSha = params.commit_id!;
+        // advance checkoutSha so the next review submission tracks correctly
+        ctx.toolState.checkoutSha = toSha;
+
+        log.info(
+          `new commits detected during review: ${fromSha.slice(0, 7)}..${toSha.slice(0, 7)}`
+        );
+
+        return {
+          success: true,
+          reviewId,
+          html_url: result.data.html_url,
+          state: result.data.state,
+          user: result.data.user?.login,
+          submitted_at: result.data.submitted_at,
+          newCommits: {
+            from: fromSha,
+            to: toSha,
+            instructions:
+              `New commits were pushed while you were reviewing. ` +
+              `Run \`git pull\` to fetch them, then review the incremental diff ` +
+              `with \`git diff ${fromSha}...HEAD\`. Submit another review covering ` +
+              `only the new changes. Do not repeat feedback from your previous review.`,
+          },
+        };
+      }

      return {
        success: true,
@@ -202,7 +234,11 @@ async function createAndSubmitWithFooter(
  });
 }

-async function reportReviewNodeId(ctx: ToolContext, reviewNodeId: string): Promise<void> {
+/**
+ * report the review node ID to the server so the WorkflowRun is marked as "review submitted".
+ * exported for use in main.ts post-agent cleanup.
+ */
+export async function reportReviewNodeId(ctx: ToolContext, reviewNodeId: string): Promise<void> {
  for (let remaining = 2; remaining >= 0; remaining--) {
    try {
      const response = await apiFetch({
@@ -153,9 +153,9 @@ Each task in the \`tasks\` array should include:

 After all tasks complete, consolidate into a **single** review:
 - merge the \`comments\` arrays from all subagent outputs
- if subagents found actionable issues: submit one \`${ghPullfrogMcpName}/create_pull_request_review\` with \`approved: false\`, the merged comments, and a unified summary body
- if no subagent found actionable issues: submit with \`approved: true\` and a brief positive summary (no inline comments)
- call \`${ghPullfrogMcpName}/report_progress\` with the summary
+- if subagents found actionable issues: submit one \`${ghPullfrogMcpName}/create_pull_request_review\` with \`approved: false\`, the merged comments, and an **empty body** (do NOT include a summary — inline comments speak for themselves and a top-level comment clutters the PR conversation on every re-review)
+- if no subagent found actionable issues: submit with \`approved: true\` and an **empty body** (no inline comments, no summary)
+- do NOT call \`${ghPullfrogMcpName}/report_progress\` — incremental reviews should be silent

 Use max effort for thorough reviews.`,

@@ -234,8 +234,21 @@ type OrchestratorGuidance = {
  orchestratorGuidance: string;
 };

-function buildOrchestratorGuidance(mode: Mode, overrideGuidance?: string): OrchestratorGuidance {
-  const guidance = overrideGuidance ?? modeGuidance[mode.name] ?? "";
+const modeInstructionParent: Record<string, string> = {
+  IncrementalReview: "Review",
+  Fix: "Build",
+};
+
+type BuildGuidanceOpts = {
+  modeInstructions?: Record<string, string>;
+  overrideGuidance?: string;
+};
+
+function buildOrchestratorGuidance(mode: Mode, opts: BuildGuidanceOpts = {}): OrchestratorGuidance {
+  const hardcoded = opts.overrideGuidance ?? modeGuidance[mode.name] ?? mode.prompt ?? "";
+  const lookupKey = modeInstructionParent[mode.name] ?? mode.name;
+  const userInstructions = opts.modeInstructions?.[lookupKey] ?? "";
+  const guidance = [hardcoded, userInstructions].filter(Boolean).join("\n\n");
  return {
    modeName: mode.name,
    description: mode.description,
@@ -295,6 +308,8 @@ export function SelectModeTool(ctx: ToolContext) {

      ctx.toolState.selectedMode = selectedMode.name;

+      const guidanceOpts: BuildGuidanceOpts = { modeInstructions: ctx.modeInstructions };
+
      if (selectedMode.name === "Plan") {
        const issueNumber = params.issue_number ?? ctx.payload.event.issue_number;
        if (issueNumber !== undefined) {
@@ -303,14 +318,17 @@ export function SelectModeTool(ctx: ToolContext) {
            ctx.toolState.existingPlanCommentId = existing.commentId;
            ctx.toolState.previousPlanBody = existing.body;
            return {
-              ...buildOrchestratorGuidance(selectedMode, modeGuidance.PlanEdit),
+              ...buildOrchestratorGuidance(selectedMode, {
+                ...guidanceOpts,
+                overrideGuidance: modeGuidance.PlanEdit,
+              }),
              previousPlanBody: existing.body,
            };
          }
        }
      }

-      return buildOrchestratorGuidance(selectedMode);
+      return buildOrchestratorGuidance(selectedMode, guidanceOpts);
    }),
  });
 }
@@ -44,6 +44,8 @@ export interface ToolState {
  pushDest?: StoredPushDest;
  // issue or PR number (same number space in GitHub)
  issueNumber?: number;
+  // PR HEAD sha at checkout time — used to detect new commits pushed during a review
+  checkoutSha?: string;
  selectedMode?: string;
  // per-subagent lifecycle tracking (keyed by subagent uuid)
  subagents: Map<string, SubagentState>;
@@ -54,6 +56,7 @@ export interface ToolState {
  review?: {
    id: number;
    nodeId: string;
+    reviewedSha: string | undefined;
  };
  dependencyInstallation?: {
    status: "not_started" | "in_progress" | "completed" | "failed";
@@ -103,6 +106,7 @@ export interface ToolContext {
  modes: Mode[];
  postCheckoutScript: string | null;
  prApproveEnabled: boolean;
+  modeInstructions: Record<string, string>;
  toolState: ToolState;
  runId: number | undefined;
  jobId: string | undefined;
@@ -384,6 +388,7 @@ export async function startMcpHttpServer(
 export type ManagedMcpServer = {
  url: string;
  stop: () => Promise<void>;
+  toolState: ToolState;
 };

 type StartSubagentMcpServerParams = {
@@ -412,5 +417,9 @@ export async function startSubagentMcpServer(
  const subagentCtx: ToolContext = { ...params.ctx, toolState: subagentToolState };
  const tools = buildSubagentTools(subagentCtx);
  const startResult = await selectMcpPort(subagentCtx, tools);
-  return { url: startResult.url, stop: () => startResult.server.stop() };
+  return {
+    url: startResult.url,
+    stop: () => startResult.server.stop(),
+    toolState: subagentToolState,
+  };
 }
@@ -114,7 +114,6 @@ export function buildSubagentInstructions(
    system: subagentSystemPreamble,
    user: params.instructions,
    eventInstructions: "",
-    repo: "",
    event: "",
    runtime: "",
  };
@@ -169,6 +168,10 @@ export async function runSubagent(params: RunSubagentParams): Promise<RunSubagen
      completeSubagent({ ctx: params.ctx, subagent: params.subagent, success: false });
      return { success: false, error: errorMessage };
    } finally {
+      // propagate review metadata to orchestrator (even on failure — the review is on GitHub)
+      if (mcpServer.toolState.review) {
+        params.ctx.toolState.review = mcpServer.toolState.review;
+      }
      await mcpServer.stop();
    }
  });