agent-dealer 1.3.0 → 1.3.2

package/bundle/server/dist/coordinator/reviewer-effect.js

@@ -28,10 +28,12 @@ import { parseProfileSnapshot, roleCeiling } from "@agent-dealer/shared";
 import { getTaskSnapshot } from "./commands.js";
 import { extractOperatorCriteria } from "./operator-criteria.js";
 import { buildReviewerPrompt, formatDiffForPrompt, TOTAL_DIFF_LIMIT } from "./prompts.js";
+import { cleanupStagedVisualArtifacts, resolveReviewerVisualEvidence, toReviewerVisualEvidenceInput, } from "./reviewer-visual-evidence.js";
+import { readLatestVisualQa } from "./visual-qa.js";
 import { guidanceForNextSession } from "./guidance.js";
 import { realReviewerSpawn, reviewerSessionLogPath } from "./spawn.js";
 import { parseReviewerResult, normalizeReviewerResult, INCOMPLETE_REVIEW_FINGERPRINT, ReviewerResult as ReviewerResultSchema, } from "./reviewer-result.js";
-import { createRoleWorktree, safeRemoveWorktree, isWorktreeClean, mergeBase, fetchRef, diffShas, } from "../adapters/git-worktree.js";
+import { createRoleWorktree, safeRemoveWorktree, isWorktreeClean, listChangedFiles, mergeBase, fetchRef, diffShas, } from "../adapters/git-worktree.js";
 import { ensureIssueRepoCheckout, roleWorktreePathForResolution, resolveCheckoutBaseBranch, } from "../adapters/managed-repo.js";
 import { prepareWorkerDeckConnection, releaseWorkerDeckConnection } from "../adapters/agent-deck-bind.js";
 import { realGithubAdapter } from "../adapters/github.js";
@@ -104,6 +106,14 @@ const EVENT_FOR_VERDICT = {
 };
 /** Best-effort: the worker never writes, so a non-clean checkout here is unexpected, not valuable work. */
 async function bestEffortRemove(repo, worktreePath) {
+    try {
+        // NOT-384: staged visual evidence goes first, so no residue survives the
+        // attempt even when the worktree removal below fails.
+        cleanupStagedVisualArtifacts(worktreePath);
+    }
+    catch {
+        // same courtesy as below — staging cleanup must never fail the attempt
+    }
     try {
         await safeRemoveWorktree({ repo, path: worktreePath, role: "reviewer" });
     }
@@ -335,12 +345,29 @@ export async function runReviewerEffect(ctx, deps = defaultDeps) {
             const baseSha = await mergeBase({ repo: worktreePath, base: `origin/${baseBranch}`, head: headSha });
             const diff = await diffShas({ worktreePath, baseSha, headSha });
             const { truncated: diffTruncated, omittedPaths } = formatDiffForPrompt(diff);
+            // NOT-384: SHA-bound CI visual evidence for this head (never throws —
+            // every failure mode resolves to `missing` with a reason, and a missing
+            // or failed capture never counts as a visual pass).
+            const changedFiles = await listChangedFiles({ worktreePath, baseSha, headSha }).catch(() => null);
+            const visualEvidence = toReviewerVisualEvidenceInput(await resolveReviewerVisualEvidence({
+                issueId: issue.id,
+                workerSessionId: sessionId,
+                worktreePath,
+                baseSha,
+                headSha,
+                changedFiles,
+                github: deps.github,
+                fetcher: deps.visualEvidenceFetcher ?? null,
+            }));
             const openFindings = listFindingsForIssue(issue.id).filter((f) => f.status === "open" || f.status === "recurring");
             const guidance = guidanceForNextSession(issue.id, sessionId);
             // NOT-314: the frozen snapshot's operator criteria — the reviewer must not
             // treat missing operator evidence as a defect (Dealer gates the merge), but
             // the probe and doc must exist. Rendered only when non-empty.
             const operatorCriteria = extractOperatorCriteria(taskSnapshot.acceptanceCriteria);
+            // NOT-381: the latest coordinator-validated visual receipt (or loud
+            // rejection), SHA-checked against the pinned head inside the prompt section.
+            const visualQaRecord = readLatestVisualQa(issue.id);
             const prompt = buildReviewerPrompt({
                 taskSnapshot,
                 round: workItem.round,
@@ -354,6 +381,8 @@ export async function runReviewerEffect(ctx, deps = defaultDeps) {
                 deckId: snapshot?.deckId ?? null,
                 guidance: guidance.length ? guidance : undefined,
                 operatorCriteria: operatorCriteria.length > 0 ? operatorCriteria : undefined,
+                visualEvidence,
+                visualQa: visualQaRecord ? { record: visualQaRecord, pinnedHeadSha: headSha } : undefined,
             });
             // NOT-83 review finding — see developer-effect.ts's identical check for the full
             // rationale: re-verify this item is still leased right before the real spawn, since an

package/bundle/server/dist/coordinator/reviewer-effect.test.js

@@ -728,3 +728,57 @@ test("NOT-225 regression: a non-zero reviewer exit keeps its session_failed beha
     const crashReason = outcome.reason ?? "";
     assert.ok(!crashReason.includes("could not start"), "a spawned-then-crashed session is not a setup failure");
 });
+test("NOT-384: available visual evidence stages CI artifacts under the reviewer worktree and cites them", async () => {
+    const { isWorktreeClean } = await import("../adapters/git-worktree.js");
+    const { reviewerVisualStagingDir } = await import("./reviewer-visual-evidence.js");
+    const issueId = await makeIssue();
+    const github = fakeGithub();
+    const uiSpawn = async (input) => {
+        fs.mkdirSync(path.join(input.cwd, "apps", "web", "src"), { recursive: true });
+        fs.writeFileSync(path.join(input.cwd, "apps", "web", "src", "app.tsx"), "export const App = () => null;\n");
+        git(input.cwd, "add", ".");
+        git(input.cwd, "-c", "user.email=agent@test", "-c", "user.name=Agent", "commit", "-q", "-m", "ui change");
+        return { exitCode: 0, transcript: "Implementation conclusion: changed the web app.", logPath: "/dev/null", timedOut: false };
+    };
+    registerEffectHandler("developer", (ctx) => runDeveloperEffect(ctx, { deckCallTool: okDeckCallTool, spawn: uiSpawn, github }));
+    startWorkflow(issueId);
+    await pump(1);
+    assert.equal(getIssue(issueId).status, "reviewing", "test setup: UI change did not reach reviewing");
+    let seenPrompt = "";
+    let seenCwd = "";
+    let cleanDuringSpawn = null;
+    const fetcher = {
+        async findRunForHead({ headSha }) {
+            return { databaseId: 4242, headSha, conclusion: "success", status: "completed" };
+        },
+        async downloadArtifact({ name, destDir }) {
+            fs.mkdirSync(destDir, { recursive: true });
+            fs.writeFileSync(path.join(destDir, "issues-home-1440x900.png"), `png-${name}`);
+            fs.writeFileSync(path.join(destDir, "issues-home-390x800.png"), `png-${name}`);
+            if (name === "ui-diff")
+                fs.writeFileSync(path.join(destDir, "SUMMARY.md"), "## UI diff\n\nhead: `h`\n");
+        },
+    };
+    const capturingSpawn = async (input) => {
+        seenPrompt = input.prompt;
+        seenCwd = input.cwd;
+        cleanDuringSpawn = await isWorktreeClean(input.cwd);
+        return verdictSpawn({ verdict: "approved" })(input);
+    };
+    registerEffectHandler("reviewer", (ctx) => runReviewerEffect(ctx, { deckCallTool: okDeckCallTool, spawn: capturingSpawn, github, visualEvidenceFetcher: fetcher }));
+    await pump(1);
+    const issue = getIssue(issueId);
+    assert.equal(issue.status, "final_review");
+    const stagingDir = reviewerVisualStagingDir(seenCwd);
+    assert.ok(stagingDir.startsWith(seenCwd + path.sep), "staging dir is inside the reviewer worktree");
+    assert.ok(seenPrompt.includes(stagingDir), "reviewer input must name the staged directory");
+    assert.ok(seenPrompt.includes(issue.headSha), "reviewer input must cite the head SHA");
+    assert.ok(seenPrompt.includes("## UI diff"), "reviewer input must embed the diff summary");
+    assert.match(seenPrompt, /1440x900 and 390x800/);
+    assert.equal(cleanDuringSpawn, true, "the worktree reports clean with staged evidence present");
+    const visual = listArtifactsForIssue(issueId).find((a) => a.kind === "visual_evidence");
+    assert.ok(visual, "expected a recorded visual_evidence artifact");
+    assert.equal(JSON.parse(visual.contentJson).state, "available");
+    assert.equal(fs.existsSync(stagingDir), false, "the staging directory is gone after the attempt");
+    assert.equal(fs.existsSync(seenCwd), false, "the reviewer worktree is removed after the attempt");
+});