@goodandready/dsh-moa 0.2.12 → 0.2.13

package/lib/moa-prompts.js

@@ -33,6 +33,35 @@ Penalize and strictly downgrade candidates exhibiting any of the following flaws
 8. 🚫 Context Amnesia & Regressions:
    - Dropping or breaking previously functioning project features while adding new code.`
 
+export const ROLE_PERSONA_PROMPTS = {
+  minimalist: `### 🎯 Specialized Engineering Persona: THE MINIMALIST (Ponytail)
+- Prioritize the standard library and native platform capabilities over third-party dependencies.
+- Zero boilerplate, no premature abstractions, interfaces, or unneeded layers.
+- Write the shortest, cleanest working solution with maximum readability.`,
+
+  robustness: `### 🎯 Specialized Engineering Persona: ROBUSTNESS & DEFENSIVE DESIGN
+- Emphasize paranoid input validation, boundary checking, and comprehensive error handling.
+- Anticipate network failures, null/undefined edge cases, malformed data, and race conditions.
+- Ensure grace under failure and informative, actionable error reporting.`,
+
+  performance: `### 🎯 Specialized Engineering Persona: HIGH PERFORMANCE & EFFICIENCY
+- Prioritize asymptotic time and space complexity, minimal memory allocations, and zero redundant work.
+- Optimize hot paths, streaming data processing, and efficient algorithmic structures.
+- Document the Big-O complexity and performance characteristics of your solution.`,
+
+  tester: `### 🎯 Specialized Engineering Persona: TESTABILITY & VERIFICATION
+- Structure code for maximum testability, modular decoupling, and clear side-effect boundaries.
+- Include comprehensive unit/integration test specifications verifying happy paths and edge cases.
+- Emphasize deterministic behavior and assertions.`,
+
+  general: '',
+}
+
+export const SYNTAX_CORRECTION_DIRECTIVE = `### ⚠️ Syntax Warning & Auto-Fix Directive:
+Some candidate proposals have detected syntax flaws (annotated with [⚠️ Syntax Warning]).
+CRITICAL JUDGE DIRECTIVE: If a candidate with a syntax flaw presents superior architecture, algorithm, or engineering logic compared to other candidates, DO NOT reject them solely for this syntax flaw!
+Instead, you MUST correct the syntax error directly during synthesis/assembly and declare that candidate the winner.`
+
 export const LANGUAGE_MIRRORING_DIRECTIVE = `### 🌐 Language Mirroring Requirement
 CRITICAL: You MUST write your entire analysis, reasoning, verdict, explanations and instructions in the EXACT SAME LANGUAGE as the user's prompt (e.g. Russian if the prompt is written in Russian, English if in English). Do NOT switch or translate to English unless explicitly requested by the user.`
 
@@ -154,6 +183,37 @@ At the end, add a note that the user can answer briefly (e.g.: "1, 2, dark theme
 /**
  * Builds the curator synthesis prompt with component analysis, model recommendation, and optional blind review.
  */
+/**
+ * Builds the Round 2 Consilium / Peer Critique prompt for candidate models.
+ */
+export function buildPeerCritiquePrompt(userPrompt, myProposal, otherProposals = [], isBlind = true) {
+  const othersText = otherProposals
+    .map((p, idx) => {
+      const label = isBlind ? `Candidate ${idx + 1}` : (p.label || `Candidate ${idx + 1}`)
+      return `### ${label} Alternative Proposal:
+${p.text}`
+    })
+    .join('\n\n---\n\n')
+
+  return `You are participating in Round 2 (Consilium / Peer Critique & Solution Refinement) of an MoA ensemble.
+
+Original User Request:
+${userPrompt}
+
+Your Initial Solution (Round 1):
+${myProposal}
+
+Alternative Solutions from Peer Candidates:
+${othersText}
+
+Instructions:
+1. 🔍 Peer Critique: Briefly evaluate the other candidates' solutions. Point out any hidden bugs, race conditions, antipatterns, or edge-case omissions in their logic.
+2. 🛡️ Defend & Refine: Adopt the strongest architectural ideas or optimizations from competitors to enhance your own solution. Fix any oversights in your own code.
+3. 🚀 Final Refined Deliverable: Present your complete, production-ready, improved code with full explanations.
+
+${LANGUAGE_MIRRORING_DIRECTIVE}`
+}
+
 export function buildCuratorSynthesisPrompt(userPrompt, referenceOutputs = [], judgeCriteria = '', options = {}) {
   const isBlind = Boolean(options.blindEvaluation)
 
@@ -166,9 +226,10 @@ export function buildCuratorSynthesisPrompt(userPrompt, referenceOutputs = [], j
       if (referenceOutputs.length >= 3 && textContent.length > 3000) {
         textContent = stripOrSummarizeCode(textContent)
       }
+      const syntaxNote = r.syntaxWarning ? ` [⚠️ Syntax Warning: ${r.syntaxWarning}]` : ''
       const header = isBlind
-        ? `Candidate ${i + 1}:${fileSummary}`
-        : `Candidate ${i + 1} — ${r.label}:${fileSummary}`
+        ? `Candidate ${i + 1}:${syntaxNote}${fileSummary}`
+        : `Candidate ${i + 1} — ${r.label}:${syntaxNote}${fileSummary}`
       return `${header}\n${textContent}`
     })
     .join('\n\n')
@@ -189,7 +250,9 @@ ${joined}
 ${ANTIPATTERNS_RUBRIC}
 
 ${LANGUAGE_MIRRORING_DIRECTIVE}
-
+${referenceOutputs.some((r) => r.syntaxWarning) ? `
+${SYNTAX_CORRECTION_DIRECTIVE}
+` : ''}
 Instructions:
 Your response MUST be structured into three clear parts:
 
@@ -230,9 +293,10 @@ export function buildSynthesisPrompt(userPrompt, referenceOutputs = [], judgeCri
       if (referenceOutputs.length >= 3 && textContent.length > 3000) {
         textContent = stripOrSummarizeCode(textContent)
       }
+      const syntaxNote = r.syntaxWarning ? ` [⚠️ Syntax Warning: ${r.syntaxWarning}]` : ''
       const header = isBlind
-        ? `Reference ${i + 1}:${fileSummary}`
-        : `Reference ${i + 1} — ${r.label}:${fileSummary}`
+        ? `Reference ${i + 1}:${syntaxNote}${fileSummary}`
+        : `Reference ${i + 1} — ${r.label}:${syntaxNote}${fileSummary}`
       return `${header}\n${textContent}`
     })
     .join('\n\n')
@@ -252,7 +316,7 @@ ${joined}
 ${ANTIPATTERNS_RUBRIC}
 
 ${LANGUAGE_MIRRORING_DIRECTIVE}
-
+${referenceOutputs.some((r) => r.syntaxWarning) ? `\n${SYNTAX_CORRECTION_DIRECTIVE}\n` : ''}
 Instructions:
 Your response MUST be structured into three clear parts:
 

package/lib/moa-runner.js

@@ -11,53 +11,16 @@
  */
 
 import path from 'node:path'
-import {
-  extractFileBlocks,
-  collectProjectContext,
-  isRefinementTask,
-  writeCandidateWorkspace,
-  promoteCandidateWorkspace,
-  cleanMoaWorkspaces,
-} from './file-workspace.js'
+import crypto from 'node:crypto'
+import { extractFileBlocks, collectProjectContext, isRefinementTask, writeCandidateWorkspace, promoteCandidateWorkspace, cleanMoaWorkspaces, verifyFileSyntax } from './file-workspace.js'
 import { estimateTokenCost } from './pricing.js'
 import { recordMoaRun, recordMoaRunAsync } from './history.js'
-import {
-  slotLabel,
-  cleanAdvisoryMessages,
-  isBroadPromptRequiringQuestions,
-  buildQuestionSynthesisPrompt,
-  buildCuratorSynthesisPrompt,
-  buildSynthesisPrompt,
-  SYSTEM_ROLE_PROPOSER,
-  ANTIPATTERNS_RUBRIC,
-} from './moa-prompts.js'
-import {
-  parseWinnerIndex,
-  parseRecommendedAssembler,
-  parseMoACommand,
-  stripOrSummarizeCode,
-  formatMoAResponse,
-} from './moa-parser.js'
-
-// Re-export prompt and parser functions for external consumers / backwards compatibility
-export {
-  slotLabel,
-  cleanAdvisoryMessages,
-  isBroadPromptRequiringQuestions,
-  buildQuestionSynthesisPrompt,
-  buildCuratorSynthesisPrompt,
-  buildSynthesisPrompt,
-  ANTIPATTERNS_RUBRIC,
-} from './moa-prompts.js'
-
-export {
-  parseWinnerIndex,
-  parseRecommendedAssembler,
-  parseMoACommand,
-  stripOrSummarizeCode,
-  formatMoAResponse,
-} from './moa-parser.js'
+import { slotLabel, cleanAdvisoryMessages, isBroadPromptRequiringQuestions, buildQuestionSynthesisPrompt, buildCuratorSynthesisPrompt, buildSynthesisPrompt, buildPeerCritiquePrompt, ROLE_PERSONA_PROMPTS, SYSTEM_ROLE_PROPOSER, ANTIPATTERNS_RUBRIC } from './moa-prompts.js'
+import { parseWinnerIndex, parseRecommendedAssembler, parseMoACommand, stripOrSummarizeCode, formatMoAResponse } from './moa-parser.js'
 
+// Re-exports for consumers & backward compatibility
+export { slotLabel, cleanAdvisoryMessages, isBroadPromptRequiringQuestions, buildQuestionSynthesisPrompt, buildCuratorSynthesisPrompt, buildSynthesisPrompt, ANTIPATTERNS_RUBRIC } from './moa-prompts.js'
+export { parseWinnerIndex, parseRecommendedAssembler, parseMoACommand, stripOrSummarizeCode, formatMoAResponse } from './moa-parser.js'
 export { estimateTokenCost } from './pricing.js'
 
 export const DEFAULT_PROMPT = 'Please propose an optimal, well-structured, production-ready solution with full code and explanations.'
@@ -94,8 +57,6 @@ export async function runReferencesParallel(references, messages, options = {},
 
   const advisoryMessages = cleanAdvisoryMessages(messages)
   const systemPrompt = options.systemPrompt || REFERENCE_SYSTEM_PROMPT
-  // Deterministic prefix for optimal prompt caching hit rate
-  const fullMessages = [{ role: 'system', content: systemPrompt }, ...advisoryMessages]
   const timeoutMs = options.timeoutMs ?? ((options.timeoutSec ?? 60) * 1000)
   const maxRetries = options.maxRetries ?? 0
   const quorumEnabled = Boolean(options.quorumEnabled)
@@ -117,6 +78,10 @@ export async function runReferencesParallel(references, messages, options = {},
 
   references.forEach((slot, i) => {
     const label = slotLabel(slot)
+    const persona = slot?.role_persona && ROLE_PERSONA_PROMPTS[slot.role_persona]
+      ? `\n\n${ROLE_PERSONA_PROMPTS[slot.role_persona]}`
+      : ''
+    const slotMessages = [{ role: 'system', content: systemPrompt + persona }, ...advisoryMessages]
 
     const runOne = async () => {
       try {
@@ -125,7 +90,7 @@ export async function runReferencesParallel(references, messages, options = {},
           {
             provider: slot.provider,
             model: slot.model,
-            messages: fullMessages,
+            messages: slotMessages,
             temperature: options.temperature ?? 0.6,
             maxTokens: options.maxTokens ?? 4096,
             timeoutMs,
@@ -144,7 +109,7 @@ export async function runReferencesParallel(references, messages, options = {},
         const text = typeof res === 'string' ? res : (res?.content || res?.text || '')
 
         const fallbackUsage = (typeof res === 'object' && res?.usage) ? res.usage : {
-          inputTokens: Math.max(1, Math.round(fullMessages.map((m) => m.content).join('').length / 4)),
+          inputTokens: Math.max(1, Math.round(slotMessages.map((m) => m.content).join('').length / 4)),
           outputTokens: Math.max(1, Math.round(text.length / 4)),
         }
         const costInfo = estimateTokenCost(slot, fallbackUsage, options.prices)
@@ -328,6 +293,9 @@ export async function runMoAPipeline({
   const refTimeoutSec = typeof preset?.reference_timeout_sec === 'number' ? preset.reference_timeout_sec : 60
   const aggTimeoutSec = typeof preset?.aggregator_timeout_sec === 'number' ? preset.aggregator_timeout_sec : 180
   const isBlindEvaluation = Boolean(preset?.blind_evaluation)
+  const isPeerCritiqueEnabled = Boolean(preset?.peer_critique_enabled)
+  const allowCandidateOverride = Boolean(preset?.allow_candidate_override)
+  const runId = crypto.randomUUID()
 
   // 2. Collect project context for refinement tasks
   const isRefinement = isRefinementTask(userPrompt)
@@ -531,6 +499,45 @@ export async function runMoAPipeline({
     }
   }
 
+  // 7b. Consilium Round 2 (Peer Critique) if enabled
+  if (isPeerCritiqueEnabled && successfulRefs.length > 1) {
+    if (typeof onProgress === 'function') {
+      onProgress('🤝 *Consilium Round 2: Candidates reviewing peer proposals in parallel...*\n')
+    }
+    const r2Promises = successfulRefs.map(async (cand) => {
+      const opponents = successfulRefs
+        .filter((c) => c.index !== cand.index)
+        .map((c) => ({ label: isBlindEvaluation ? `Candidate ${c.index}` : c.label, text: c.text }))
+      const r2Prompt = buildPeerCritiquePrompt(userPrompt, cand.text, opponents, isBlindEvaluation)
+      try {
+        const slot = referenceModels[cand.index - 1] || { provider: cand.provider, model: cand.model }
+        const res = await callWithTransientRetry(callLlm, {
+          provider: slot.provider,
+          model: slot.model,
+          messages: [{ role: 'user', content: r2Prompt }],
+          temperature: refTemp,
+          maxTokens,
+          timeoutMs: refTimeoutSec * 1000,
+        }, candidateRetries)
+        const refinedText = typeof res === 'string' ? res : (res?.content || res?.text || cand.text)
+        cand.text = refinedText
+        const r2Files = extractFileBlocks(refinedText)
+        if (r2Files.length > 0) {
+          cand.files = r2Files
+          cand.syntaxWarning = (verifyFileSyntax(r2Files) || []).map((w) => `${w.file}: ${w.error}`).join('; ')
+        }
+        if (typeof res === 'object' && res?.usage) {
+          cand.usage.inputTokens = (cand.usage.inputTokens || 0) + (res.usage.inputTokens || 0)
+          cand.usage.outputTokens = (cand.usage.outputTokens || 0) + (res.usage.outputTokens || 0)
+          cand.usage.totalTokens = (cand.usage.totalTokens || 0) + (res.usage.totalTokens || 0)
+          const extraCost = estimateTokenCost(slot, res.usage, prices)
+          cand.costUsd = Number(((cand.costUsd || 0) + extraCost.costUsd).toFixed(5))
+        }
+      } catch {}
+    })
+    await Promise.allSettled(r2Promises)
+  }
+
   // 8. Synthesis phase via primary judge or fallback chain
   const synthesisPrompt = buildSynthesisPrompt(userPrompt, referenceOutputs, judgeCriteria, {
     curatorSynthesis: isCuratorSynthesis,
@@ -604,15 +611,16 @@ export async function runMoAPipeline({
   const synthesizedFiles = extractFileBlocks(synthesizedText)
   let promotedFiles = []
 
+  const keepWorkspaces = allowCandidateOverride
   if (synthesizedFiles.length > 0) {
     await writeCandidateWorkspace(cwd, 'curator-synthesis', synthesizedFiles)
-    promotedFiles = await promoteCandidateWorkspace(cwd, 'curator-synthesis')
+    promotedFiles = await promoteCandidateWorkspace(cwd, 'curator-synthesis', { keepMoa: keepWorkspaces })
   } else if (referenceOutputs[winningIndex - 1]?.files?.length > 0) {
-    promotedFiles = await promoteCandidateWorkspace(cwd, winningIndex)
+    promotedFiles = await promoteCandidateWorkspace(cwd, winningIndex, { keepMoa: keepWorkspaces })
   } else if (successfulRefs[0]?.files?.length > 0) {
     const fallbackIdx = successfulRefs[0].index
-    promotedFiles = await promoteCandidateWorkspace(cwd, fallbackIdx)
-  } else {
+    promotedFiles = await promoteCandidateWorkspace(cwd, fallbackIdx, { keepMoa: keepWorkspaces })
+  } else if (!keepWorkspaces) {
     await cleanMoaWorkspaces(cwd)
   }
 
@@ -629,6 +637,7 @@ export async function runMoAPipeline({
   // Record run to history
   try {
     recordMoaRun({
+      id: runId,
       prompt: userPrompt,
       preset: preset?.name || 'default',
       isRefinement,
@@ -658,6 +667,8 @@ export async function runMoAPipeline({
     winningIndex,
     winnerModel,
     promotedFiles,
+    runId,
+    allowCandidateOverride,
     ...(livePreview ? { liveCanvas: livePreview } : {}),
     usage: {
       totalTokens,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-moa",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",