vibe-coding-master 0.7.42 → 0.7.44

package/dist/backend/services/gate-review-service.js

@@ -10,6 +10,7 @@ const REVIEWER_AGENT_PATH = ".claude/agents/reviewer.md";
 const GATE_REVIEW_DIR = ".ai/vcm/gate-reviews";
 const REQUESTS_DIR = ".ai/vcm/gate-reviews/requests";
 const GATE_REVIEW_VERSION = 1;
+const HARNESS_COMMIT_PREFIX = "[VCM Harness] ";
 const REVIEWER_ROLE = "reviewer";
 const DEFAULT_REPORT_POLL_INTERVAL_MS = 1000;
 const activeRuns = new Map();
@@ -107,6 +108,7 @@ export function createGateReviewService(deps) {
             taskSlug,
             taskRepoRoot,
             stateRoot: projectConfig.stateRoot,
+            handoffDir: task.handoffDir,
             config: loadRuntimeConfig(reviewSettings)
         };
     }
@@ -345,42 +347,21 @@ export function createGateReviewService(deps) {
             }
         }
         if (gate === "code-diff") {
-            const prerequisiteError = await readCodeDiffPrerequisiteError(deps, context, index, codeDiffSource);
-            if (prerequisiteError) {
-                index = applyGateState(index, gate, {
-                    status: "failed",
-                    decision: undefined,
-                    error: prerequisiteError,
-                    exceptionReason: undefined,
-                    requestId: undefined,
-                    requestPath: undefined,
-                    inputHash: undefined,
-                    baseCommit: undefined,
-                    headCommit: undefined,
-                    commits: undefined,
-                    changedFiles: undefined,
-                    diffStat: undefined,
-                    codeDiffSource,
-                    codeDiffSources: codeDiffSource ? [codeDiffSource] : undefined,
-                    requestedAt: undefined,
-                    startedAt: undefined,
-                    completedAt: now(),
-                    callbackStatus: "not_sent",
-                    callbackError: undefined
-                }, now(), true);
-                await saveIndex(deps.fs, context.taskRepoRoot, index);
+            const evidenceError = await readCodeDiffEvidenceError(deps.fs, context.taskRepoRoot, codeDiffSource);
+            if (evidenceError) {
+                index = await recordCodeDiffStartFailure(index, context, gate, codeDiffSource, evidenceError);
                 return {
                     status: "failed_to_start",
                     gate,
                     record: index.gates[gate],
-                    message: prerequisiteError
+                    message: evidenceError
                 };
             }
         }
         const codeDiffInput = gate === "code-diff"
             ? await resolveCodeDiffInput(deps, context, record)
             : undefined;
-        if (gate === "code-diff" && !codeDiffInput) {
+        if (gate === "code-diff" && (!codeDiffInput || codeDiffInput.commits.length === 0)) {
             index = applyGateState(index, gate, {
                 status: "not_required",
                 decision: undefined,
@@ -389,16 +370,16 @@ export function createGateReviewService(deps) {
                 requestId: undefined,
                 requestPath: undefined,
                 inputHash: undefined,
-                baseCommit: undefined,
-                headCommit: undefined,
-                commits: undefined,
-                changedFiles: undefined,
-                diffStat: undefined,
+                baseCommit: codeDiffInput?.baseCommit,
+                headCommit: codeDiffInput?.headCommit,
+                commits: codeDiffInput?.commits,
+                changedFiles: codeDiffInput?.changedFiles,
+                diffStat: codeDiffInput?.diffStat,
                 codeDiffSource,
                 codeDiffSources: codeDiffSource ? [codeDiffSource] : undefined,
                 requestedAt: undefined,
                 startedAt: undefined,
-                completedAt: undefined,
+                completedAt: codeDiffInput ? now() : undefined,
                 callbackStatus: "not_sent",
                 callbackError: undefined
             }, now(), true);
@@ -407,11 +388,51 @@ export function createGateReviewService(deps) {
                 status: "not_required",
                 gate,
                 record: index.gates[gate],
-                message: "No new commits to review."
+                message: codeDiffInput ? "No non-Harness commits to review." : "No new commits to review."
             };
         }
-        const codeDiffSources = gate === "code-diff" && codeDiffInput && codeDiffSource
-            ? resolveCodeDiffSources(record, codeDiffInput, codeDiffSource)
+        if (gate === "code-diff") {
+            const prerequisiteError = await readCodeDiffValidationGateError(deps, context, index);
+            if (prerequisiteError) {
+                index = await recordCodeDiffStartFailure(index, context, gate, codeDiffSource, prerequisiteError, codeDiffInput);
+                return {
+                    status: "failed_to_start",
+                    gate,
+                    record: index.gates[gate],
+                    message: prerequisiteError
+                };
+            }
+        }
+        async function recordCodeDiffStartFailure(currentIndex, currentContext, currentGate, currentSource, message, currentCodeDiffInput) {
+            const failedIndex = applyGateState(currentIndex, currentGate, {
+                status: "failed",
+                decision: undefined,
+                error: message,
+                exceptionReason: undefined,
+                requestId: undefined,
+                requestPath: undefined,
+                inputHash: undefined,
+                baseCommit: currentCodeDiffInput?.baseCommit,
+                headCommit: currentCodeDiffInput?.headCommit,
+                commits: currentCodeDiffInput?.commits,
+                changedFiles: currentCodeDiffInput?.changedFiles,
+                diffStat: currentCodeDiffInput?.diffStat,
+                codeDiffSource: currentSource,
+                codeDiffSources: currentSource ? [currentSource] : undefined,
+                requestedAt: undefined,
+                startedAt: undefined,
+                completedAt: now(),
+                callbackStatus: "not_sent",
+                callbackError: undefined
+            }, now(), true);
+            await saveIndex(deps.fs, currentContext.taskRepoRoot, failedIndex);
+            return failedIndex;
+        }
+        const currentCodeDiffSources = gate === "code-diff" && codeDiffSource
+            ? await resolveWorkflowCodeDiffSources(deps, context, codeDiffSource)
+            : undefined;
+        const codeDiffSources = gate === "code-diff" && codeDiffInput && currentCodeDiffSources
+            ? resolveCodeDiffSources(record, codeDiffInput, currentCodeDiffSources)
             : undefined;
         const inputHash = await computeInputHash(deps, context.taskRepoRoot, gate, codeDiffInput, codeDiffSources);
         if (!options.force
@@ -1059,44 +1080,78 @@ async function resolveCodeDiffInput(deps, context, record) {
         return undefined;
     }
     const range = `${baseCommit}..${headCommit}`;
-    const commits = splitLines(await commandStdout(deps.runner, context.taskRepoRoot, [
+    const allCommits = splitLines(await commandStdout(deps.runner, context.taskRepoRoot, [
         "log",
         "--oneline",
         "--reverse",
         range
     ]));
-    if (commits.length === 0) {
+    if (allCommits.length === 0) {
         return undefined;
     }
-    const changedFiles = splitLines(await commandStdout(deps.runner, context.taskRepoRoot, [
-        "diff",
-        "--name-only",
-        "--find-renames",
-        range
-    ]));
-    const diffStat = await commandStdout(deps.runner, context.taskRepoRoot, [
-        "diff",
-        "--stat",
-        "--find-renames",
-        range
-    ]);
-    const diff = await commandStdout(deps.runner, context.taskRepoRoot, [
-        "diff",
-        "--binary",
-        "--find-renames",
-        range
-    ]);
+    const commits = allCommits.filter((line) => !isHarnessCommitLine(line));
+    const commitShas = commits.map(commitShaFromOneline);
+    const changedFiles = new Set();
+    const diffStats = [];
+    const diffs = [];
+    for (const commitSha of commitShas) {
+        for (const changedFile of splitLines(await commandStdout(deps.runner, context.taskRepoRoot, [
+            "show",
+            "--format=",
+            "--name-only",
+            "--find-renames",
+            commitSha
+        ]))) {
+            changedFiles.add(changedFile);
+        }
+        const stat = await commandStdout(deps.runner, context.taskRepoRoot, [
+            "show",
+            "--format=",
+            "--stat",
+            "--find-renames",
+            commitSha
+        ]);
+        if (stat.trim()) {
+            diffStats.push(stat.trim());
+        }
+        const patch = await commandStdout(deps.runner, context.taskRepoRoot, [
+            "show",
+            "--format=",
+            "--binary",
+            "--find-renames",
+            commitSha
+        ]);
+        if (patch) {
+            diffs.push(patch);
+        }
+    }
+    const diffStat = diffStats.join("\n");
+    const diff = diffs.join("\n");
     const diffHash = createHash("sha256").update(diff).digest("hex");
     return {
         baseCommit,
         headCommit,
         commits,
-        changedFiles,
+        commitShas,
+        changedFiles: [...changedFiles],
         diffStat,
         diffHash
     };
 }
+function commitShaFromOneline(line) {
+    return line.split(/\s+/, 1)[0] ?? line;
+}
+function isHarnessCommitLine(line) {
+    const separator = line.indexOf(" ");
+    return separator >= 0 && line.slice(separator + 1).startsWith(HARNESS_COMMIT_PREFIX);
+}
 async function resolveCodeDiffBaseCommit(deps, context, record, headCommit) {
+    if (record.gate === "code-diff"
+        && record.status === "failed"
+        && record.baseCommit
+        && await isAncestor(deps.runner, context.taskRepoRoot, record.baseCommit, headCommit)) {
+        return record.baseCommit;
+    }
     if (record.gate === "code-diff"
         && record.status === "completed"
         && record.decision === "request_changes"
@@ -1111,6 +1166,12 @@ async function resolveCodeDiffBaseCommit(deps, context, record, headCommit) {
         && await isAncestor(deps.runner, context.taskRepoRoot, record.headCommit, headCommit)) {
         return record.headCommit;
     }
+    if (record.gate === "code-diff"
+        && record.status === "not_required"
+        && record.headCommit
+        && await isAncestor(deps.runner, context.taskRepoRoot, record.headCommit, headCommit)) {
+        return record.headCommit;
+    }
     const rootHead = (await commandStdout(deps.runner, context.repoRoot, ["rev-parse", "HEAD"])).trim();
     if (rootHead
         && rootHead !== headCommit
@@ -1165,7 +1226,7 @@ async function computeInputHash(deps, taskRepoRoot, gate, codeDiffInput, codeDif
         digest.update(coreArtifact);
         digest.update(await deps.fs.readText(resolveRepoPath(taskRepoRoot, coreArtifact)));
     }
-    const common = [
+    const common = gate === "code-diff" ? [] : [
         "CLAUDE.md",
         ".claude/agents/architect.md",
         ".claude/agents/coder.md",
@@ -1189,10 +1250,6 @@ async function computeInputHash(deps, taskRepoRoot, gate, codeDiffInput, codeDif
     if (gate === "code-diff" && codeDiffInput) {
         digest.update("codeDiffSources");
         digest.update(codeDiffSources?.join("\n") ?? "<missing>");
-        digest.update("baseCommit");
-        digest.update(codeDiffInput.baseCommit);
-        digest.update("headCommit");
-        digest.update(codeDiffInput.headCommit);
         digest.update("commits");
         digest.update(codeDiffInput.commits.join("\n"));
         digest.update("changedFiles");
@@ -1295,11 +1352,14 @@ async function readValidationReportError(fs, taskRepoRoot) {
     }
     return undefined;
 }
-async function readCodeDiffPrerequisiteError(deps, context, index, source) {
-    const reportError = await readValidationReportError(deps.fs, context.taskRepoRoot);
+async function readCodeDiffEvidenceError(fs, taskRepoRoot, source) {
+    const reportError = await readValidationReportError(fs, taskRepoRoot);
     if (reportError) {
         return "code-diff requires completed Tester validation. " + reportError;
     }
+    return readCodeDiffSourceArtifactError(fs, taskRepoRoot, source);
+}
+async function readCodeDiffValidationGateError(deps, context, index) {
     const validationGate = index.gates["validation-adequacy"];
     if (validationGate.required && validationGate.status !== "skipped" && validationGate.status !== "overridden") {
         if (validationGate.status !== "completed" || validationGate.decision !== "approve") {
@@ -1310,7 +1370,7 @@ async function readCodeDiffPrerequisiteError(deps, context, index, source) {
             return "code-diff requires a current validation-adequacy approval; code or test evidence changed after the recorded approval.";
         }
     }
-    return readCodeDiffSourceArtifactError(deps.fs, context.taskRepoRoot, source);
+    return undefined;
 }
 async function readArchitectureEvidenceError(fs, taskRepoRoot) {
     const relativePath = ".ai/vcm/handoffs/architecture-evidence.md";
@@ -1399,17 +1459,16 @@ Use each captured snapshot as the immutable handoff or prior-Gate input for this
 Code Diff Input:
 This code-diff gate reviews the new commits from one PM route flow, not the whole task and not one terminal turn.
 Code sources: ${codeDiffSources?.join(" -> ") ?? "<missing>"}
-Base commit: ${codeDiffInput.baseCommit}
-Head commit: ${codeDiffInput.headCommit}
-Commits:
+Reviewable commits:
 ${codeDiffInput.commits.map((line) => `- ${line}`).join("\n")}
 Changed files:
 ${codeDiffInput.changedFiles.length > 0 ? codeDiffInput.changedFiles.map((line) => `- ${line}`).join("\n") : "- <none>"}
 Diff commands:
-- git diff --stat --find-renames ${codeDiffInput.baseCommit}..${codeDiffInput.headCommit}
-- git diff --find-renames ${codeDiffInput.baseCommit}..${codeDiffInput.headCommit}
-- git show --stat --oneline <commit>
-Review only this commit range.`
+${codeDiffInput.commitShas.flatMap((commitSha) => [
+            `- git show --stat --oneline ${commitSha}`,
+            `- git show --find-renames ${commitSha}`
+        ]).join("\n")}
+Review only these commits.`
         : "";
     return `[VCM GATE REVIEW]
 Task: ${context.taskSlug}
@@ -1763,18 +1822,58 @@ function getSourceArtifacts(gate, codeDiffSources) {
             ...(codeDiffSources ?? []).flatMap((source) => CODE_DIFF_SOURCE_ARTIFACTS[source])
         ])];
 }
-function resolveCodeDiffSources(record, codeDiffInput, currentSource) {
+function resolveCodeDiffSources(record, codeDiffInput, currentSources) {
     const continuingRecordedRange = record.baseCommit === codeDiffInput.baseCommit
         && ((record.status === "completed" && record.decision === "request_changes")
             || record.status === "failed");
     if (!continuingRecordedRange) {
-        return [currentSource];
+        return currentSources;
     }
     return [...new Set([
             ...(normalizeCodeDiffSources(record.codeDiffSources, record.codeDiffSource) ?? []),
-            currentSource
+            ...currentSources
         ])];
 }
+async function resolveWorkflowCodeDiffSources(deps, context, currentSource) {
+    if (!deps.workflowControlService) {
+        return [currentSource];
+    }
+    try {
+        const workflowContext = {
+            taskRepoRoot: context.taskRepoRoot,
+            stateRoot: context.stateRoot,
+            handoffDir: context.handoffDir,
+            taskSlug: context.taskSlug
+        };
+        const [state, progress] = await Promise.all([
+            deps.workflowControlService.getState(workflowContext),
+            deps.workflowControlService.getProgress(workflowContext)
+        ]);
+        const startedAtSequence = state.flowRun?.startedAtSequence;
+        if (state.warnings.length > 0 || startedAtSequence === undefined) {
+            return [currentSource];
+        }
+        const sources = [];
+        for (const entry of progress.history) {
+            if (entry.sequence < startedAtSequence)
+                continue;
+            if (entry.flow === "code-change" && entry.targetRole === "coder") {
+                sources.push("coder");
+            }
+            else if (entry.flow === "architect-debug" && entry.targetRole === "architect") {
+                sources.push("architect-debug");
+            }
+            else if (entry.flow === "architecture-diagnosis" && entry.targetRole === "architect") {
+                sources.push("architect-diagnosis");
+            }
+        }
+        sources.push(currentSource);
+        return [...new Set(sources)];
+    }
+    catch {
+        return [currentSource];
+    }
+}
 function normalizeCodeDiffSources(sources, source) {
     const normalized = Array.isArray(sources) ? sources.filter(isCodeDiffSource) : [];
     if (normalized.length === 0 && isCodeDiffSource(source)) {