sneakoscope 7.3.0 → 7.6.0

package/dist/core/commands/image-ux-review-command.js

@@ -1,12 +1,12 @@
 import path from 'node:path';
 import fsp from 'node:fs/promises';
 import { ensureDir, nowIso, projectRoot, readJson, writeJsonAtomic } from '../fsx.js';
-import { createMission, findLatestMission, loadMission } from '../mission.js';
+import { createMission, findLatestMission, loadMission, missionDir } from '../mission.js';
 import { flag, readOption } from './command-utils.js';
 import { printJson } from '../../cli/output.js';
-import { IMAGE_UX_REVIEW_FIX_LOOP_ARTIFACT, IMAGE_UX_REVIEW_FIX_TASK_PLAN_ARTIFACT, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT, IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT, IMAGE_UX_REVIEW_GATE_ARTIFACT, IMAGE_UX_REVIEW_HONEST_MODE_ARTIFACT, IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT, IMAGE_UX_REVIEW_IMAGEGEN_REQUEST_ARTIFACT, IMAGE_UX_REVIEW_ITERATION_REPORT_ARTIFACT, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT, IMAGE_UX_REVIEW_POLICY_ARTIFACT, IMAGE_UX_REVIEW_RECAPTURE_ARTIFACT, IMAGE_UX_REVIEW_SCREEN_INVENTORY_ARTIFACT, imageUxReviewProofEvidence, buildImageUxCalloutExtractionReport, writeImageUxReviewRouteArtifacts } from '../image-ux-review.js';
+import { IMAGE_UX_REVIEW_FIX_LOOP_ARTIFACT, IMAGE_UX_REVIEW_FIX_TASK_PLAN_ARTIFACT, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT, IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT, IMAGE_UX_REVIEW_GATE_ARTIFACT, IMAGE_UX_REVIEW_HONEST_MODE_ARTIFACT, IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT, IMAGE_UX_REVIEW_IMAGEGEN_REQUEST_ARTIFACT, IMAGE_UX_REVIEW_ITERATION_REPORT_ARTIFACT, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT, IMAGE_UX_REVIEW_POLICY_ARTIFACT, IMAGE_UX_REVIEW_RECAPTURE_ARTIFACT, IMAGE_UX_REVIEW_SCREEN_INVENTORY_ARTIFACT, imageUxReviewProofEvidence, imageUxReviewCommandOutcome, buildImageUxCalloutExtractionReport, writeImageUxReviewRouteArtifacts } from '../image-ux-review.js';
 import { maybeFinalizeRoute } from '../proof/auto-finalize.js';
-import { generatedImageMetadata, generateGptImage2CalloutReview } from '../image-ux-review/imagegen-adapter.js';
+import { buildCalloutPrompt, generatedImageMetadata, generateGptImage2CalloutReview } from '../image-ux-review/imagegen-adapter.js';
 import { extractRealCallouts } from '../image-ux-review/real-callout-extractor.js';
 import { addImageRelation, ingestImage } from '../wiki-image/image-voxel-ledger.js';
 import { sha256File, imageDimensions } from '../wiki-image/image-hash.js';
@@ -15,28 +15,34 @@ import { codexChromeExtensionStatus } from '../codex-app.js';
 import { requireCodexImagegen } from '../imagegen/require-imagegen.js';
 import { imagegenEvidenceClassBlockers, isFullImagegenEvidenceClass, isFullImagegenOutputSource } from '../imagegen/imagegen-evidence.js';
 import { evaluateGate } from '../stop-gate/gate-evaluator.js';
+import { closeWorkOrderLedgerForRouteResult } from '../work-order-ledger.js';
 const ONE_BY_ONE_PNG_BASE64 = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMB/axX7V8AAAAASUVORK5CYII=';
+const stableImageUxArtifact = (artifactPath) => ({
+    path: artifactPath,
+    source: 'real',
+    ignoreStale: true
+});
 const IMAGE_UX_REVIEW_ARTIFACT_PATHS = {
-    policy: IMAGE_UX_REVIEW_POLICY_ARTIFACT,
-    inventory: IMAGE_UX_REVIEW_SCREEN_INVENTORY_ARTIFACT,
-    imagegen_request: IMAGE_UX_REVIEW_IMAGEGEN_REQUEST_ARTIFACT,
-    gpt_image_2_request: IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT,
-    imagegen_response: IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT,
-    generated_review_ledger: IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT,
-    issue_ledger: IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT,
-    callout_extraction_report: IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT,
-    fix_task_plan: IMAGE_UX_REVIEW_FIX_TASK_PLAN_ARTIFACT,
-    fix_loop: IMAGE_UX_REVIEW_FIX_LOOP_ARTIFACT,
-    recapture_plan: IMAGE_UX_REVIEW_RECAPTURE_ARTIFACT,
-    iteration_report: IMAGE_UX_REVIEW_ITERATION_REPORT_ARTIFACT,
+    policy: stableImageUxArtifact(IMAGE_UX_REVIEW_POLICY_ARTIFACT),
+    inventory: stableImageUxArtifact(IMAGE_UX_REVIEW_SCREEN_INVENTORY_ARTIFACT),
+    imagegen_request: stableImageUxArtifact(IMAGE_UX_REVIEW_IMAGEGEN_REQUEST_ARTIFACT),
+    gpt_image_2_request: stableImageUxArtifact(IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT),
+    imagegen_response: stableImageUxArtifact(IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT),
+    generated_review_ledger: stableImageUxArtifact(IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT),
+    issue_ledger: stableImageUxArtifact(IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT),
+    callout_extraction_report: stableImageUxArtifact(IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT),
+    fix_task_plan: stableImageUxArtifact(IMAGE_UX_REVIEW_FIX_TASK_PLAN_ARTIFACT),
+    fix_loop: stableImageUxArtifact(IMAGE_UX_REVIEW_FIX_LOOP_ARTIFACT),
+    recapture_plan: stableImageUxArtifact(IMAGE_UX_REVIEW_RECAPTURE_ARTIFACT),
+    iteration_report: stableImageUxArtifact(IMAGE_UX_REVIEW_ITERATION_REPORT_ARTIFACT),
     output_schema: {
         path: 'schemas/codex/image-ux-issue-ledger.schema.json',
         kind: 'schema',
         source: 'real',
         ignoreStale: true
     },
-    honest_mode_evidence: IMAGE_UX_REVIEW_HONEST_MODE_ARTIFACT,
-    gate: IMAGE_UX_REVIEW_GATE_ARTIFACT
+    honest_mode_evidence: stableImageUxArtifact(IMAGE_UX_REVIEW_HONEST_MODE_ARTIFACT),
+    gate: stableImageUxArtifact(IMAGE_UX_REVIEW_GATE_ARTIFACT)
 };
 export async function imageUxReviewCommand(command, args = []) {
     const root = await projectRoot();
@@ -66,13 +72,17 @@ export async function imageUxReviewCommand(command, args = []) {
 async function runImageUxReview(root, command, args = []) {
     const missionRequested = readOption(args, '--mission', null);
     const missionId = missionRequested
-        ? missionRequested === 'latest' ? await findLatestMission(root, { mode: 'image-ux-review', route: '$Image-UX-Review', gateFile: IMAGE_UX_REVIEW_GATE_ARTIFACT }) : missionRequested
+        ? missionRequested === 'latest' ? await findLatestMission(root, { mode: 'image-ux-review' }) : missionRequested
         : null;
     const imagePath = readOption(args, '--image', null) || readOption(args, '--screenshot', null);
     const generatedImage = readOption(args, '--generated-image', null);
-    const shouldGenerateCallouts = flag(args, '--generate-callouts') || flag(args, '--fix');
-    if (missionId)
+    const shouldGenerateCallouts = !generatedImage;
+    if (missionId) {
+        if (generatedImage) {
+            return continueExistingMissionWithGeneratedImage(root, command, missionId, generatedImage, args, 'sks.image-ux-review-run.v1');
+        }
         return rebuildExistingMission(root, command, [missionId, ...args], { fixRequested: flag(args, '--fix') });
+    }
     const sourcePreflight = await imageUxReviewSourcePreflight(args);
     const { fromChromeExtension, fromComputerUse, chromePreflight } = sourcePreflight;
     if (sourcePreflight.result) {
@@ -111,7 +121,7 @@ async function runImageUxReview(root, command, args = []) {
             process.exitCode = 1;
             if (flag(args, '--json'))
                 return printJson(result);
-            console.error('UX Review blocked: Codex App imagegen/gpt-image-2 is unavailable.');
+            console.error('UX Review blocked: no selected Codex imagegen/gpt-image-2 provider is ready.');
             for (const action of imagegenRequired.blocker?.next_actions || [])
                 console.error(`- ${action}`);
             return result;
@@ -133,8 +143,16 @@ async function runImageUxReview(root, command, args = []) {
         }
     };
     await writeJsonAtomic(path.join(dir, 'decision-contract.json'), contract);
-    if (generatedImage)
+    if (generatedImage) {
         await attachGeneratedReviewImage(root, dir, contract, generatedImage, { realGenerated: !flag(args, '--mock'), mock: flag(args, '--mock') });
+        if (!flag(args, '--mock')) {
+            await extractAndWriteGeneratedReview(root, dir, {
+                generatedImagePath: generatedImage,
+                sourceImagePath: sourceRel || imagePath,
+                sessionId: readOption(args, '--session', null) || readOption(args, '--session-id', null)
+            });
+        }
+    }
     if (!generatedImage && shouldGenerateCallouts) {
         const outputDir = path.join(dir, 'generated-callouts');
         const missionStartMs = Date.parse(mission.created_at || '') || undefined;
@@ -144,7 +162,9 @@ async function runImageUxReview(root, command, args = []) {
             source_screen_id: 'screen-1',
             source_image_path: path.resolve(root, sourceRel || imagePath),
             output_dir: outputDir,
-            prompt: promptForRun(command, args),
+            prompt: buildCalloutPrompt('screen-1', {
+                target: contract.answers.TARGET_SURFACE
+            }),
             requested_fidelity: 'original',
             privacy: 'local-only'
         }, {
@@ -153,11 +173,11 @@ async function runImageUxReview(root, command, args = []) {
                 generatedImageMaxAgeMs: maxAgeOverride ? Number(maxAgeOverride) * 60 * 1000 : 30 * 60 * 1000
             }
         });
+        if (result.request_artifact)
+            await fsp.copyFile(result.request_artifact, path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT));
+        if (result.response_artifact)
+            await fsp.copyFile(result.response_artifact, path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT));
         if (result.generated_image_path) {
-            if (result.request_artifact)
-                await fsp.copyFile(result.request_artifact, path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_REQUEST_ARTIFACT)).catch(() => { });
-            if (result.response_artifact)
-                await fsp.copyFile(result.response_artifact, path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT)).catch(() => { });
             const response = await readImagegenResponse(dir);
             const evidenceClass = String(response?.evidence_class || '');
             const fakeGenerated = evidenceClass === 'mock_fixture' || result.provider === 'fake_imagegen_adapter';
@@ -171,25 +191,21 @@ async function runImageUxReview(root, command, args = []) {
                 outputSha256: response?.output_sha256 || response?.output_image_sha256 || null,
                 responseArtifact: result.response_artifact || null
             });
-            const extraction = await extractRealCallouts({
-                root,
+            await extractAndWriteGeneratedReview(root, dir, {
                 generatedImagePath: result.generated_image_path,
-                sourceScreenshot: { id: 'screen-1' },
+                sourceImagePath: sourceRel || imagePath,
                 sessionId: readOption(args, '--session', null) || readOption(args, '--session-id', null)
             });
-            await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT), extraction.issue_ledger);
-            await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT), await buildImageUxCalloutExtractionReport(root, extraction, {
-                generatedImagePath: result.generated_image_path,
-                sourceImagePath: sourceRel || imagePath,
-                provider: extraction.provider
-            }));
         }
     }
     const artifacts = await writeImageUxReviewRouteArtifacts(dir, contract, { root, wrongnessChecked: true, honestModeComplete: true });
     artifacts.gate = await enforceImageUxRuntimeGate(dir, artifacts.gate, { mock: flag(args, '--mock') });
     await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GATE_ARTIFACT), artifacts.gate);
     const proof = await finalizeImageUx(root, id, command, artifacts, { mock: flag(args, '--mock'), cmd: `sks ${command} run` });
-    const result = { schema: 'sks.image-ux-review-run.v1', ok: proof.ok && artifacts.gate?.passed === true, status: artifacts.gate?.status || (artifacts.gate?.passed ? 'passed' : 'blocked'), mission_id: id, artifacts, proof: proof.validation };
+    const outcome = imageUxReviewCommandOutcome(artifacts.gate, proof.ok, {
+        allowReviewOnlyCompletion: !flag(args, '--fix')
+    });
+    const result = { schema: 'sks.image-ux-review-run.v1', ...outcome, mission_id: id, artifacts, proof: proof.validation };
     if (!result.ok)
         process.exitCode = 1;
     if (flag(args, '--json'))
@@ -197,10 +213,67 @@ async function runImageUxReview(root, command, args = []) {
     console.log(`Image UX review: ${result.ok ? 'ok' : 'blocked'} ${id}`);
     return result;
 }
-export async function imageUxReviewSourcePreflight(args = []) {
+async function extractAndWriteGeneratedReview(root, dir, input) {
+    const extraction = await extractRealCallouts({
+        root,
+        generatedImagePath: input.generatedImagePath,
+        sourceScreenshot: { id: 'screen-1' },
+        sessionId: input.sessionId || null
+    });
+    const generatedLedger = await readJson(path.join(dir, IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT), null).catch(() => null);
+    const generatedImages = Array.isArray(generatedLedger?.generated_review_images) ? generatedLedger.generated_review_images : [];
+    const localImage = generatedImages.find((image) => image.sha256 && image.sha256 === extraction.generated_image_sha256)
+        || generatedImages[0]
+        || null;
+    const localImageId = localImage?.id || null;
+    const generatedSha = localImage?.sha256 || extraction.generated_image_sha256 || null;
+    const extractedIssues = Array.isArray(extraction.issue_ledger?.issues) ? extraction.issue_ledger.issues : [];
+    const boundIssues = extractedIssues.map((issue) => ({
+        ...issue,
+        generated_review_image_id: localImageId || issue.generated_review_image_id,
+        evidence_image_id: localImageId || issue.evidence_image_id,
+        generated_image_sha256: generatedSha || issue.generated_image_sha256
+    }));
+    const boundIssueLedger = {
+        ...extraction.issue_ledger,
+        generated_image_id: localImageId,
+        generated_image_sha256: generatedSha,
+        issues: boundIssues
+    };
+    const extractionSucceeded = extraction.ok === true
+        && boundIssueLedger.validation?.ok === true
+        && boundIssues.length > 0;
+    if (localImage && generatedLedger) {
+        await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT), {
+            ...generatedLedger,
+            status: extractionSucceeded ? 'generated_and_extracted' : 'generated_extraction_blocked',
+            generated_review_images: generatedImages.map((image) => image.id === localImage.id ? {
+                ...image,
+                generated_image_sha256: generatedSha,
+                extraction_provider: extraction.provider || null,
+                extraction_status: extraction.status || (extractionSucceeded ? 'extracted' : 'blocked'),
+                callout_extraction_status: extractionSucceeded ? 'succeeded' : 'failed',
+                callout_extraction_blocker: extractionSucceeded ? null : extraction.blocker || 'callout_extraction_failed',
+                callouts: boundIssues
+            } : image)
+        });
+    }
+    await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT), boundIssueLedger);
+    await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT), await buildImageUxCalloutExtractionReport(root, extraction, {
+        generatedImagePath: input.generatedImagePath,
+        generatedImageId: localImageId,
+        sourceImagePath: input.sourceImagePath || null,
+        provider: extraction.provider
+    }));
+    return extraction;
+}
+export async function imageUxReviewSourcePreflight(args = [], opts = {}) {
     const fromChromeExtension = flag(args, '--from-chrome-extension') || Boolean(readOption(args, '--from-chrome-extension', null));
     const fromComputerUse = flag(args, '--from-computer-use') || Boolean(readOption(args, '--from-computer-use', null));
-    const chromePreflight = fromChromeExtension ? await codexChromeExtensionStatus() : null;
+    const imagePath = readOption(args, '--image', null) || readOption(args, '--screenshot', null);
+    const chromePreflight = fromChromeExtension
+        ? await (opts.chromeStatus ? opts.chromeStatus() : codexChromeExtensionStatus())
+        : null;
     if (chromePreflight && !chromePreflight.ok) {
         return {
             fromChromeExtension,
@@ -231,6 +304,22 @@ export async function imageUxReviewSourcePreflight(args = []) {
             }
         };
     }
+    if ((fromChromeExtension || fromComputerUse) && !imagePath) {
+        return {
+            fromChromeExtension,
+            fromComputerUse,
+            chromePreflight,
+            result: {
+                schema: 'sks.image-ux-review-run.v1',
+                ok: false,
+                status: 'blocked',
+                blocker: 'captured_screenshot_path_required',
+                guidance: [
+                    'Capture the real page or native-app screen first, then pass its local artifact path with --image <captured-path>.'
+                ]
+            }
+        };
+    }
     return { fromChromeExtension, fromComputerUse, chromePreflight, result: null };
 }
 function printImageUxReviewSourcePreflightBlock(result) {
@@ -240,6 +329,10 @@ function printImageUxReviewSourcePreflightBlock(result) {
             console.error(result.chrome_extension.docs_url);
         return;
     }
+    if (result.blocker === 'captured_screenshot_path_required') {
+        console.error('UX Review blocked: capture completed without a bound screenshot artifact. Pass --image <captured-path>.');
+        return;
+    }
     console.error('UX Review blocked: web/browser UX review requires Codex Chrome Extension, not Computer Use. Use --from-chrome-extension after setup, or provide a screenshot with --image.');
 }
 async function calloutsImageUxReview(root, command, args = []) {
@@ -255,8 +348,12 @@ async function calloutsImageUxReview(root, command, args = []) {
     return runImageUxReview(root, command, ['--image', imagePath, '--generate-callouts', '--json', ...(flag(args, '--mock') ? ['--mock'] : [])]);
 }
 async function extractIssuesImageUxReview(root, command, args = []) {
+    const missionRequested = readOption(args, '--mission', null);
+    const missionId = missionRequested
+        ? missionRequested === 'latest' ? await findLatestMission(root, { mode: 'image-ux-review' }) : missionRequested
+        : null;
     const generatedImage = readOption(args, '--generated-image', null);
-    const sourceImage = readOption(args, '--image', null) || readOption(args, '--screenshot', null) || generatedImage;
+    const sourceImage = readOption(args, '--image', null) || readOption(args, '--screenshot', null);
     if (!generatedImage) {
         const result = { schema: 'sks.image-ux-review-extract-issues.v1', ok: false, status: 'blocked', blocker: 'generated_image_required' };
         process.exitCode = 1;
@@ -265,6 +362,9 @@ async function extractIssuesImageUxReview(root, command, args = []) {
         console.error('Usage: sks ux-review extract-issues --generated-image <path> --json');
         return result;
     }
+    if (missionId) {
+        return continueExistingMissionWithGeneratedImage(root, command, missionId, generatedImage, args, 'sks.image-ux-review-extract-issues.v1');
+    }
     const { id, dir, mission } = await createMission(root, { mode: 'image-ux-review', prompt: `Extract UX issues from ${generatedImage}` });
     const sourceRel = sourceImage ? await stageSourceImage(root, dir, sourceImage) : null;
     const contract = {
@@ -275,18 +375,11 @@ async function extractIssuesImageUxReview(root, command, args = []) {
     await writeJsonAtomic(path.join(dir, 'decision-contract.json'), contract);
     await attachGeneratedReviewImage(root, dir, contract, generatedImage, { realGenerated: !flag(args, '--mock'), mock: flag(args, '--mock') });
     if (!flag(args, '--mock')) {
-        const extraction = await extractRealCallouts({
-            root,
+        await extractAndWriteGeneratedReview(root, dir, {
             generatedImagePath: generatedImage,
-            sourceScreenshot: { id: 'screen-1' },
+            sourceImagePath: sourceRel || sourceImage,
             sessionId: readOption(args, '--session', null) || readOption(args, '--session-id', null)
         });
-        await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT), extraction.issue_ledger);
-        await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT), await buildImageUxCalloutExtractionReport(root, extraction, {
-            generatedImagePath: generatedImage,
-            sourceImagePath: sourceRel || sourceImage,
-            provider: extraction.provider
-        }));
     }
     const artifacts = await writeImageUxReviewRouteArtifacts(dir, contract, { root, wrongnessChecked: true, honestModeComplete: true });
     const proof = await finalizeImageUx(root, id, command, artifacts, { mock: flag(args, '--mock'), cmd: `sks ${command} extract-issues` });
@@ -298,9 +391,56 @@ async function extractIssuesImageUxReview(root, command, args = []) {
     console.log(`Image UX issue extraction: ${result.ok ? 'ok' : 'blocked'} ${id}`);
     return result;
 }
+async function continueExistingMissionWithGeneratedImage(root, command, missionId, generatedImage, args, schema) {
+    const { dir, mission } = await loadMission(root, missionId);
+    const contract = await readJson(path.join(dir, 'decision-contract.json'), { prompt: mission.prompt, answers: {}, sealed_hash: null });
+    const mock = flag(args, '--mock');
+    const ledger = await attachGeneratedReviewImage(root, dir, contract, generatedImage, {
+        realGenerated: !mock,
+        mock
+    });
+    if (!mock) {
+        await extractAndWriteGeneratedReview(root, dir, {
+            generatedImagePath: generatedImage,
+            sourceImagePath: sourceImageFromContract(contract),
+            sessionId: readOption(args, '--session', null) || readOption(args, '--session-id', null)
+        });
+    }
+    const artifacts = await writeImageUxReviewRouteArtifacts(dir, contract, {
+        root,
+        wrongnessChecked: true,
+        honestModeComplete: true
+    });
+    artifacts.gate = await enforceImageUxRuntimeGate(dir, artifacts.gate, { mock });
+    await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GATE_ARTIFACT), artifacts.gate);
+    const proof = await finalizeImageUx(root, missionId, command, artifacts, {
+        mock,
+        cmd: `sks ${command} ${schema.endsWith('extract-issues.v1') ? 'extract-issues' : 'attach-generated'}`
+    });
+    const outcome = imageUxReviewCommandOutcome(artifacts.gate, proof.ok, {
+        allowReviewOnlyCompletion: !flag(args, '--fix')
+    });
+    const result = {
+        schema,
+        ...outcome,
+        mission_id: missionId,
+        generated_review_ledger: ledger,
+        issue_ledger: artifacts.issue_ledger,
+        gate: artifacts.gate,
+        proof: proof.validation
+    };
+    if (!result.ok)
+        process.exitCode = 1;
+    if (flag(args, '--json'))
+        return printJson(result);
+    console.log(`Image UX review continued: ${result.ok ? 'ok' : 'blocked'} ${missionId}`);
+    return result;
+}
 async function attachGeneratedImageCommand(root, command, args = []) {
-    const missionArg = args.find((arg) => !String(arg).startsWith('--')) || 'latest';
-    const missionId = missionArg === 'latest' ? await findLatestMission(root, { mode: 'image-ux-review', route: '$Image-UX-Review', gateFile: IMAGE_UX_REVIEW_GATE_ARTIFACT }) : missionArg;
+    const missionArg = readOption(args, '--mission', null)
+        || args.find((arg, index) => !String(arg).startsWith('--') && !String(args[index - 1] || '').startsWith('--'))
+        || 'latest';
+    const missionId = missionArg === 'latest' ? await findLatestMission(root, { mode: 'image-ux-review' }) : missionArg;
     const imagePath = readOption(args, '--image', null) || readOption(args, '--generated-image', null);
     if (!missionId || !imagePath) {
         const result = { schema: 'sks.image-ux-review-attach-generated.v1', ok: false, status: 'blocked', blocker: !missionId ? 'mission_required' : 'generated_image_required' };
@@ -309,15 +449,7 @@ async function attachGeneratedImageCommand(root, command, args = []) {
             return printJson(result);
         return result;
     }
-    const { dir, mission } = await loadMission(root, missionId);
-    const contract = await readJson(path.join(dir, 'decision-contract.json'), { prompt: mission.prompt, answers: {}, sealed_hash: null });
-    const ledger = await attachGeneratedReviewImage(root, dir, contract, imagePath, { realGenerated: !flag(args, '--mock'), mock: flag(args, '--mock') });
-    const artifacts = await writeImageUxReviewRouteArtifacts(dir, contract, { root, wrongnessChecked: true, honestModeComplete: true });
-    const result = { schema: 'sks.image-ux-review-attach-generated.v1', ok: artifacts.gate.generated_image_ingested === true, mission_id: missionId, generated_review_ledger: ledger, gate: artifacts.gate };
-    if (flag(args, '--json'))
-        return printJson(result);
-    console.log(`Generated image attached: ${missionId}`);
-    return result;
+    return continueExistingMissionWithGeneratedImage(root, command, missionId, imagePath, args, 'sks.image-ux-review-attach-generated.v1');
 }
 async function attachAfterImageCommand(root, command, args = []) {
     const missionArg = args.find((arg) => !String(arg).startsWith('--')) || 'latest';
@@ -359,13 +491,18 @@ async function rebuildExistingMission(root, command, args = [], opts = {}) {
         root,
         wrongnessChecked: true,
         fixLoop: { requirePatch: opts.fixRequested === true },
-        recapture: { computerUseAvailable: false },
+        recapture: opts.proofRequested === true ? undefined : { computerUseAvailable: false },
+        preserveExistingRecapture: opts.proofRequested === true,
         honestModeComplete: opts.proofRequested === true
     });
     artifacts.gate = await enforceImageUxRuntimeGate(dir, artifacts.gate, { mock: flag(args, '--mock') });
     await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GATE_ARTIFACT), artifacts.gate);
-    const proof = await finalizeImageUx(root, missionId, command, artifacts, { mock: flag(args, '--mock'), cmd: `sks ${command} ${opts.fixRequested ? 'fix' : opts.recaptureRequested ? 'recapture' : 'build'}` });
-    const result = { schema: 'sks.image-ux-review-build.v2', ok: proof.ok && artifacts.gate?.passed === true, status: artifacts.gate?.status || (artifacts.gate?.passed ? 'passed' : 'blocked'), mission_id: missionId, artifacts, proof: proof.validation };
+    const proofAction = opts.proofRequested ? 'proof' : opts.fixRequested ? 'fix' : opts.recaptureRequested ? 'recapture' : 'build';
+    const proof = await finalizeImageUx(root, missionId, command, artifacts, { mock: flag(args, '--mock'), cmd: `sks ${command} ${proofAction}` });
+    const outcome = imageUxReviewCommandOutcome(artifacts.gate, proof.ok, {
+        allowReviewOnlyCompletion: false
+    });
+    const result = { schema: 'sks.image-ux-review-build.v2', ...outcome, mission_id: missionId, artifacts, proof: proof.validation };
     if (!result.ok)
         process.exitCode = 1;
     if (flag(args, '--json'))
@@ -510,10 +647,19 @@ async function attachGeneratedReviewImage(root, dir, contract, imagePath, opts =
         evidence_class: evidenceClass,
         output_source: outputSource,
         output_sha256: outputSha256 || undefined,
+        output_id: response?.output_id || null,
         real_generated: opts.realGenerated === true && isFullImagegenEvidenceClass(evidenceClass),
         mock: opts.mock === true
     });
-    if (!response && opts.realGenerated === true) {
+    if (response) {
+        await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT), {
+            ...response,
+            generated_review_image_id: metadata.id,
+            output_sha256: response.output_sha256 || response.output_image_sha256 || metadata.sha256,
+            output_image_sha256: response.output_image_sha256 || response.output_sha256 || metadata.sha256
+        });
+    }
+    else if (opts.realGenerated === true) {
         await writeJsonAtomic(path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT), {
             schema: 'sks.image-ux-gpt-image-2-response.v1',
             created_at: nowIso(),
@@ -526,6 +672,7 @@ async function attachGeneratedReviewImage(root, dir, contract, imagePath, opts =
             output_image_sha256: metadata.sha256,
             output_sha256: metadata.sha256,
             output_id: metadata.output_id || null,
+            generated_review_image_id: metadata.id,
             output_source: 'manual_attach',
             dimensions: { width: metadata.width, height: metadata.height, format: metadata.format },
             local_only: true
@@ -582,7 +729,9 @@ async function readImagegenResponse(dir) {
 }
 async function enforceImageUxRuntimeGate(dir, gate = {}, opts = {}) {
     const inventory = await readJson(path.join(dir, IMAGE_UX_REVIEW_SCREEN_INVENTORY_ARTIFACT), null);
+    const generatedLedger = await readJson(path.join(dir, IMAGE_UX_REVIEW_GENERATED_REVIEW_LEDGER_ARTIFACT), null);
     const issueLedger = await readJson(path.join(dir, IMAGE_UX_REVIEW_ISSUE_LEDGER_ARTIFACT), null);
+    const extractionReport = await readJson(path.join(dir, IMAGE_UX_REVIEW_CALLOUT_EXTRACTION_REPORT_ARTIFACT), null);
     const response = await readJson(path.join(dir, IMAGE_UX_REVIEW_GPT_IMAGE_2_RESPONSE_ARTIFACT), null);
     const blockers = new Set(Array.isArray(gate?.blockers) ? gate.blockers.map(String) : []);
     const sourceScreens = Array.isArray(inventory?.source_screens) ? inventory.source_screens : [];
@@ -606,19 +755,34 @@ async function enforceImageUxRuntimeGate(dir, gate = {}, opts = {}) {
     const responseEvidence = await validateImagegenResponseEvidence(response, dir);
     for (const blocker of responseEvidence.blockers)
         blockers.add(blocker);
+    const bindingBlockers = validateGeneratedImageEvidenceBinding(response, generatedLedger, extractionReport, issueLedger);
+    for (const blocker of bindingBlockers)
+        blockers.add(blocker);
     const nextBlockers = [...blockers];
     const codexGenerated = responseEvidence.ok === true && gate?.gpt_image_2_callout_generated === true;
+    const sourceScreenshotMinResolutionPassed = sourceScreens.length > 0
+        && sourceScreens.every((screen) => Number(screen?.width || 0) >= 64 && Number(screen?.height || 0) >= 64);
+    const issueLedgerRealExtraction = issues.length > 0
+        && issues.every((issue) => issue?.extraction_provider !== 'mock_fixture' && issue?.source !== 'mock_fixture');
+    const reviewReportCompleted = gate?.review_report_completed === true
+        && codexGenerated
+        && bindingBlockers.length === 0
+        && sourceScreenshotMinResolutionPassed
+        && issueLedgerRealExtraction;
     const passed = gate?.passed === true && codexGenerated && nextBlockers.length === 0;
     return {
         ...gate,
         passed,
         ok: passed,
-        status: passed ? 'passed' : 'blocked',
+        status: passed ? 'passed' : reviewReportCompleted ? 'review_completed' : 'blocked',
+        verified_level: passed ? gate?.verified_level || 'verified' : reviewReportCompleted ? 'verified_partial' : 'blocked',
+        review_report_completed: reviewReportCompleted,
+        completion_scope: reviewReportCompleted ? 'capture_imagegen_ocr_and_ux_report' : gate?.completion_scope || null,
         gpt_image_2_callout_generated: codexGenerated,
         generated_image_evidence: responseEvidence.ok === true,
         imagegen_response_evidence: responseEvidence,
-        source_screenshot_min_resolution_passed: sourceScreens.length > 0 && sourceScreens.every((screen) => Number(screen?.width || 0) >= 64 && Number(screen?.height || 0) >= 64),
-        issue_ledger_real_extraction: issues.length > 0 && issues.every((issue) => issue?.extraction_provider !== 'mock_fixture' && issue?.source !== 'mock_fixture'),
+        source_screenshot_min_resolution_passed: sourceScreenshotMinResolutionPassed,
+        issue_ledger_real_extraction: issueLedgerRealExtraction,
         blockers: nextBlockers
     };
 }
@@ -631,6 +795,9 @@ async function validateImagegenResponseEvidence(response = null, dir = process.c
         blockers.push('imagegen_response_schema_invalid');
     if (response.ok !== true || response.status !== 'generated')
         blockers.push(response.blocker || 'imagegen_response_not_generated');
+    if (response.image_output_partial_frame === true || response.payload_summary?.image_output_partial_frame === true) {
+        blockers.push('imagegen_response_partial_image_output');
+    }
     const evidenceClass = String(response.evidence_class || '');
     blockers.push(...imagegenEvidenceClassBlockers('imagegen_response', evidenceClass));
     const source = String(response.output_source || '');
@@ -638,6 +805,9 @@ async function validateImagegenResponseEvidence(response = null, dir = process.c
         blockers.push('imagegen_response_output_source_invalid');
     const outputPath = String(response.output_image_path || '');
     const expectedSha = String(response.output_sha256 || response.output_image_sha256 || '');
+    const generatedReviewImageId = String(response.generated_review_image_id || '');
+    if (!generatedReviewImageId)
+        blockers.push('imagegen_response_generated_review_image_id_missing');
     if (!outputPath)
         blockers.push('imagegen_response_output_path_missing');
     if (!expectedSha)
@@ -665,9 +835,36 @@ async function validateImagegenResponseEvidence(response = null, dir = process.c
         output_source: source || null,
         output_image_path: outputPath || null,
         output_sha256: expectedSha || null,
+        generated_review_image_id: generatedReviewImageId || null,
         blockers: [...new Set(blockers)]
     };
 }
+function validateGeneratedImageEvidenceBinding(response, generatedLedger, extractionReport, issueLedger) {
+    if (!response || response.ok !== true || response.status !== 'generated')
+        return [];
+    const blockers = [];
+    const generatedId = String(response.generated_review_image_id || '');
+    const responseSha = String(response.output_sha256 || response.output_image_sha256 || '');
+    const images = Array.isArray(generatedLedger?.generated_review_images) ? generatedLedger.generated_review_images : [];
+    const image = images.find((row) => String(row?.id || '') === generatedId);
+    if (generatedId && !image)
+        blockers.push('imagegen_response_generated_review_image_id_not_in_ledger');
+    if (image && responseSha && String(image.sha256 || '') !== responseSha)
+        blockers.push('imagegen_response_generated_review_image_sha256_mismatch');
+    if (extractionReport) {
+        if (String(extractionReport.generated_image_id || '') !== generatedId)
+            blockers.push('callout_extraction_generated_image_id_mismatch');
+        if (responseSha && String(extractionReport.generated_image_sha256 || '') !== responseSha)
+            blockers.push('callout_extraction_generated_image_sha256_mismatch');
+    }
+    for (const issue of Array.isArray(issueLedger?.issues) ? issueLedger.issues : []) {
+        if (String(issue.generated_review_image_id || '') !== generatedId)
+            blockers.push(`issue_generated_image_id_mismatch:${issue.id || 'unknown'}`);
+        if (responseSha && String(issue.generated_image_sha256 || '') !== responseSha)
+            blockers.push(`issue_generated_image_sha256_mismatch:${issue.id || 'unknown'}`);
+    }
+    return [...new Set(blockers)];
+}
 function rootFromMissionDir(dir) {
     const marker = `${path.sep}.sneakoscope${path.sep}missions${path.sep}`;
     const idx = String(dir).indexOf(marker);
@@ -689,7 +886,7 @@ async function finalizeImageUx(root, missionId, command, artifacts, opts = {}) {
     const artifactList = Object.entries(artifacts)
         .filter(([, value]) => value !== null && value !== undefined)
         .map(([key]) => IMAGE_UX_REVIEW_ARTIFACT_PATHS[key] || key);
-    return maybeFinalizeRoute(root, {
+    const finalized = await maybeFinalizeRoute(root, {
         missionId,
         route: routeForCommand(command),
         gateFile: 'image-ux-review-gate.json',
@@ -705,6 +902,17 @@ async function finalizeImageUx(root, missionId, command, artifacts, opts = {}) {
         allowActiveWrongnessPartial: artifacts.gate?.reference_only === true,
         command: { cmd: opts.cmd || `sks ${command}`, status: artifacts.gate?.blockers?.length ? 1 : 0 }
     });
+    const proofIssues = Array.isArray(finalized?.validation?.issues)
+        ? finalized.validation.issues.map(String)
+        : [];
+    await closeWorkOrderLedgerForRouteResult(missionDir(root, missionId), {
+        ok: artifacts.gate?.passed === true && finalized?.ok === true,
+        blockers: [...new Set([
+                ...(Array.isArray(artifacts.gate?.blockers) ? artifacts.gate.blockers.map(String) : []),
+                ...proofIssues
+            ])]
+    });
+    return finalized;
 }
 async function ensureFixtureImageVoxelRelation(root, missionId, imageRel) {
     await ingestImage(root, imageRel, { missionId, source: 'mock_fixture_source', id: `${missionId}-source-screen` });
@@ -738,6 +946,10 @@ function promptForRun(command, args) {
     const source = readOption(args, '--image', null) || readOption(args, '--screenshot', null) || readOption(args, '--mission', null) || 'latest Codex Chrome Extension or native Computer Use screenshot';
     return `$${routeForCommand(command).replace(/^\$/, '')} ${source} with gpt-image-2 callouts${flag(args, '--fix') ? ', then fix the issues' : ''}`;
 }
+function sourceImageFromContract(contract) {
+    const sources = contract?.answers?.IMAGE_UX_REVIEW_SOURCE_IMAGES;
+    return Array.isArray(sources) && sources.length ? String(sources[0]) : null;
+}
 function missingMission(args) {
     const result = { schema: 'sks.image-ux-review-status.v2', ok: false, status: 'missing_mission' };
     if (flag(args, '--json'))