train S3: merge #3698 at 395df002ec v1.92.64.0

lib/capy-review-pass.js

@@ -91,8 +91,35 @@ const briefText = async (r) => {
 };
 const roleArgs = (r) => ' --role ' + q(r.role) + (r.name ? ' --name ' + q(r.name) : '');
 const REASONING = { medium: 'medium', light: 'low' };
-const modelOf = (r) => r.model || (input.models || {})[r.role === 'specialist-batched' ? 'specialist' : r.role]
-  || (REASONING[r.effort] && input.laneModel ? { model_id: input.laneModel, reasoning_mode: REASONING[r.effort] } : undefined);
+const family = (id) => (typeof id === 'string' && id.includes('/') ? id.slice(0, id.indexOf('/')).toLowerCase() : '');
+const CERTIFIED_OUTSIDE = { model_id: 'openai/gpt-6.1-sol', reasoning_mode: 'medium' };
+const voiceFile = input.out.replace(/\/+$/, '') + '/voice-models.json';
+let voices = { laneModel: null, readers: {} };
+let laneFamily = family(input.laneModel);
+const modelOf = (r) => r.model || (r.reader in voices.readers ? voices.readers[r.reader] || undefined
+  : (input.models || {})[r.role === 'specialist-batched' ? 'specialist' : r.role]
+  || (r.role === 'outside-voice' && laneFamily === 'anthropic' ? CERTIFIED_OUTSIDE : undefined)
+  || (REASONING[r.effort] && input.laneModel ? { model_id: input.laneModel, reasoning_mode: REASONING[r.effort] } : undefined));
+const outsideNote = (r, source) => {
+  const ov = modelOf(r);
+  const certified = laneFamily === 'anthropic' && ov.model_id === CERTIFIED_OUTSIDE.model_id && ov.reasoning_mode === CERTIFIED_OUTSIDE.reasoning_mode;
+  return 'OUTSIDE_VOICE: ' + ov.model_id + ' reasoning=' + (ov.reasoning_mode || 'default') + ' ' + source
+    + (certified ? ' (certified configuration)' : '; outside the certified configuration (' + CERTIFIED_OUTSIDE.model_id + ' at ' + CERTIFIED_OUTSIDE.reasoning_mode + ' beside an anthropic lane)');
+};
+const familyStop = (readers) => {
+  const native = readers.find((x) => x.role === 'adversarial-native');
+  const nativeFamily = family(native && modelOf(native) ? modelOf(native).model_id : undefined);
+  for (const ov of readers.filter((x) => x.role === 'outside-voice' && !['created', 'collected', 'failed'].includes(x.state))) {
+    const om = modelOf(ov);
+    if (!om) return "the outside voice needs input.models['outside-voice'] (a model of another family); none was given";
+    const lane = voices.laneModel || input.laneModel;
+    if (!laneFamily && !nativeFamily) return 'the outside voice ' + om.model_id + ' cannot be checked against another family: ' + (lane ? 'the lane model ' + lane + ' has no provider prefix and no native voice model was given' : 'neither input.laneModel nor a native voice model was given');
+    const f = family(om.model_id);
+    if (!f) return 'the outside voice ' + om.model_id + ' has no provider prefix, so its family cannot be checked';
+    if (f === laneFamily || f === nativeFamily) return 'the outside voice ' + om.model_id + ' is the ' + f + ' family, the same as the ' + (f === nativeFamily ? 'native voice' : 'lane model') + "; Step 11 needs input.models['outside-voice'] from another family";
+  }
+  return null;
+};
 const safe = (s) => s.replace(/[^a-zA-Z0-9._-]/g, '_');
 const active = input.stage === 'voices' ? ['voices'] : ['first', 'specialists', 'red-team'];
 const beforeKey = input.stage === 'voices' ? 'before_voices' : 'before';
@@ -100,6 +127,11 @@ const beforeKey = input.stage === 'voices' ? 'before_voices' : 'before';
 try {
   let m = await load();
   if (input.stage !== 'voices' && m.next === 'fix-check') active.push('voices');
+  if (active.includes('voices')) {
+    const v = await sh('cat ' + q(voiceFile) + ' 2>/dev/null || true');
+    if (v.out.trim()) voices = JSON.parse(v.out);
+    if (voices.laneModel) laneFamily = family(voices.laneModel);
+  }
   if (input.stage === 'voices' && !m.readers.some((r) => r.stage === 'voices')) return finish(['VOICES: none (the pass plan lists no Step 11 voice)', 'NEXT: judge']);
   const seen = {};
   for (const s of input.logStart || []) {
@@ -125,12 +157,17 @@ try {
       await mark(r.reader, found[0].status === 'draft' ? 'queued' : 'created', { path: found[0].path });
     }
     m = await load();
+    const sameFamily = active.includes('voices') && familyStop(m.readers);
+    if (sameFamily) return stop(sameFamily);
     for (const r of m.readers.filter((x) => active.includes(x.stage) && x.state === 'queued')) {
       const t = byPath.get(r.path);
       if (t && t.status !== 'draft') { await mark(r.reader, 'created', {}); continue; }
       const model = modelOf(r);
       const s = await tools.subagent.start({ indices: [Number(r.path)], machine: 'shared', ...(model ? { model } : {}) });
-      if ((s.started || []).length) await mark(r.reader, 'created', {});
+      if ((s.started || []).length) {
+        if (r.role === 'outside-voice') lines.push(outsideNote(r, 'as dispatched, started from the queue'));
+        await mark(r.reader, 'created', {});
+      }
       else if (r.state_at && (await now()) - Date.parse(r.state_at) > stuckMs) return stop(r.reader + ' (subagent ' + r.path + ') still queued after ' + Math.round(stuckMs / 60000) + ' minutes; free a subagent slot, then rerun');
     }
     for (const r of m.readers.filter((x) => active.includes(x.stage) && x.state === 'created')) {
@@ -167,7 +204,6 @@ try {
       lines.push(...s.out.trim().split('\n'));
       m = await load();
     }
-    if (m.readers.some((x) => x.stage === stage && x.role === 'outside-voice' && x.state === 'rendered' && !modelOf(x))) return stop("the outside voice needs input.models['outside-voice'] (a model of another family); none was given");
     const unmapped = m.readers.find((x) => x.stage === stage && x.state === 'rendered' && REASONING[x.effort] && !modelOf(x));
     if (unmapped) return stop(unmapped.reader + ' runs at effort=' + unmapped.effort + ', which needs input.laneModel (your model id) or input.models; none was given');
     for (const r of m.readers.filter((x) => x.stage === stage && x.state === 'rendered')) {
@@ -184,6 +220,11 @@ try {
         const b = await reading();
         if (b) { await sh(bin + ' mark --manifest ' + q(mf) + ' --before ' + b.tokens + ',' + b.credits + (beforeKey === 'before_voices' ? ' --voices' : '')); m[beforeKey] = b; }
       }
+      if (r.role === 'outside-voice') lines.push(outsideNote(r, r.model || (input.models || {})['outside-voice'] ? 'given' : 'default for an anthropic lane'));
+      if (r.stage === 'voices') {
+        voices = { laneModel: voices.laneModel || input.laneModel || null, readers: { ...voices.readers, [r.reader]: model || null } };
+        await tools.capy.write({ path: voiceFile, content: JSON.stringify(voices) });
+      }
       await mark(r.reader, 'intent', {});
       const res = await tools.subagent.create({ tasks: [{ title: r.title, prompt: text }], start: { machine: 'shared', ...(model ? { model } : {}) } });
       const idx = String(res.tasks[0].index);