zelari-code 2.11.1 → 2.12.0

package/dist/cli/kraken/verifierLifecycle.js

@@ -1,5 +1,7 @@
 import { VerifierService, } from '@zelari/core/verification';
 import { collectProviderText } from '../tools/krakenSelectTool.js';
+import { resolveCrossModelVerifier } from '../tools/krakenModel.js';
+import { getWorkingDiff } from '../gitOps.js';
 import { loadVerifierModelSelection } from './verifierResolution.js';
 /**
  * Opt-in rule (see module doc): explicit env wins in both directions;
@@ -37,11 +39,76 @@ export function makeVerifierCallModel(loadStream, identity, timeoutMs = 120_000)
         return { text, provider: identity.provider, model: identity.model };
     };
 }
-function resolveIdentity(selection, session) {
+function resolveIdentity(selection, session, familyCandidates, env = process.env) {
     if (selection.mode === 'fixed') {
         return { provider: selection.provider, model: selection.model };
     }
-    return session && session.provider && session.model ? session : null;
+    if (!session || !session.provider || !session.model)
+        return null;
+    // P0.6 cross-model: inherit mode may route to a different provider family
+    // when family candidates were supplied; otherwise keep session identity.
+    if (familyCandidates && familyCandidates.length > 0) {
+        const cross = resolveCrossModelVerifier(session, familyCandidates, env);
+        if (cross)
+            return { provider: cross.provider, model: cross.model };
+    }
+    return session;
+}
+/** Criterion ids that look like deterministic test/typecheck/build/lint runs. */
+function isTestEvidenceCriterion(criterionId) {
+    const id = criterionId.toLowerCase();
+    return ['test', 'typecheck', 'build', 'lint'].some((k) => id.includes(k));
+}
+/**
+ * Blind evidence excerpt: criterionId + status + detail for deterministic
+ * test/typecheck/build/lint criteria, capped at maxChars. Empty when none.
+ */
+export function extractTestOutputExcerpt(results, maxChars = 4000) {
+    const lines = [];
+    for (const r of results) {
+        if (!isTestEvidenceCriterion(r.criterionId))
+            continue;
+        lines.push([r.criterionId, r.status, r.detail].filter(Boolean).join(' — '));
+    }
+    if (lines.length === 0)
+        return '';
+    return lines.join('\n').slice(0, maxChars);
+}
+/**
+ * Build the BLIND review input for VerifierService.reviewCompletion:
+ * original task, synthetic deterministic-evidence summary, staged git diff
+ * summary, and a capped test-output excerpt. Never reads session messages,
+ * builder reasoning, or assistant text — the verifier sees evidence only.
+ * Every extra input degrades independently (empty/failing diff → omitted).
+ */
+export async function buildBlindReviewInput(evaluation, deps) {
+    const results = evaluation.results ?? [];
+    const passed = results.filter((r) => r.status === 'pass').length;
+    const verdict = evaluation.evaluation?.verdict ?? 'UNKNOWN';
+    const summary = `Kraken BUILD turn — deterministic evidence: ${passed}/${results.length} ` +
+        `criteria pass, completion verdict ${verdict}.`;
+    const task = deps.task?.trim();
+    const testOutputExcerpt = extractTestOutputExcerpt(results);
+    let diffSummary;
+    try {
+        const res = await (deps.getDiff ?? getWorkingDiff)({
+            cwd: deps.cwd ?? process.cwd(),
+            maxChars: 8000,
+            staged: true,
+        });
+        if (res && !res.empty && res.diff)
+            diffSummary = res.diff;
+    }
+    catch {
+        // degrade-and-continue: the blind review proceeds without the diff
+    }
+    return {
+        ...(task ? { task } : {}),
+        summary,
+        ...(diffSummary !== undefined ? { diffSummary } : {}),
+        ...(testOutputExcerpt ? { testOutputExcerpt } : {}),
+        results,
+    };
 }
 /**
  * Run the advisory completion review and ATTACH it to the evaluation
@@ -56,7 +123,7 @@ export async function runAdvisoryVerifierReview(evaluation, deps = {}) {
     const selection = deps.selection ?? loadVerifierModelSelection();
     if (!verifierReviewEnabled(selection, env))
         return null;
-    const identity = resolveIdentity(selection, deps.session);
+    const identity = resolveIdentity(selection, deps.session, deps.familyCandidates, env);
     let callModel = deps.callModel;
     if (!callModel) {
         if (!identity || !deps.loadStream)
@@ -74,12 +141,9 @@ export async function runAdvisoryVerifierReview(evaluation, deps = {}) {
         emit: deps.emit,
         env,
     });
-    const passed = evaluation.results.filter((r) => r.status === 'pass').length;
-    const summary = `Kraken BUILD turn — deterministic evidence: ${passed}/${evaluation.results.length} ` +
-        `criteria pass, completion verdict ${evaluation.evaluation.verdict}.`;
+    const blind = await buildBlindReviewInput(evaluation, deps);
     const review = await service.reviewCompletion({
-        summary,
-        results: evaluation.results,
+        ...blind,
         session: deps.session,
     });
     evaluation.review = review;

package/dist/cli/kraken/verifierLifecycle.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifierLifecycle.js","sourceRoot":"","sources":["../../../src/cli/kraken/verifierLifecycle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifierLifecycle.js","sourceRoot":"","sources":["../../../src/cli/kraken/verifierLifecycle.ts"],"names":[],"mappings":"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"}