@goodandready/dsh-moa 0.2.69 → 0.2.71

package/lib/pipeline/candidates.js

@@ -1,3 +1,5 @@
+import { runSpeculativeMoa } from '../moa-speculative.js'
+import { runAdversarialTddLoop } from '../moa-adversarial-tdd.js'
 import { assignAdaptivePersonas } from '../moa-adaptive-personas.js'
 import { runSubagentSwarm } from '../moa-swarm.js'
 import { runReferencesParallel } from '../moa-candidates.js'
@@ -37,7 +39,29 @@ export async function stageCandidateRound1({
     ? assignAdaptivePersonas(effectiveReferences, typeof lastMsgText === 'string' ? lastMsgText : '').references
     : effectiveReferences
 
-  const referenceOutputs = preset?.subagent_swarm_enabled
+  let referenceOutputs = null
+  if (preset?.speculative_moa_enabled && !preset?.subagent_swarm_enabled) {
+    const specRes = await runSpeculativeMoa(
+      adaptiveRefs,
+      enrichedMessages,
+      {
+        draftModel: preset.speculative_draft_model,
+        systemPrompt: candidateSystemPrompt,
+        temperature: refTemp,
+        maxTokens,
+        prices,
+        signal,
+      },
+      callLlm,
+      onProgress
+    )
+    if (!specRes.fallbackToStandard && Array.isArray(specRes.referenceOutputs)) {
+      referenceOutputs = specRes.referenceOutputs
+    }
+  }
+
+  if (!referenceOutputs) {
+    referenceOutputs = preset?.subagent_swarm_enabled
     ? await runSubagentSwarm(adaptiveRefs, enrichedMessages, { temperature: refTemp, maxTokens, signal, cwd, runId }, callLlm, onProgress)
     : await runReferencesParallel(
     adaptiveRefs,
@@ -59,6 +83,7 @@ export async function stageCandidateRound1({
     callLlm,
     onProgress
   )
+  }
 
   if (signal?.aborted) {
     await cleanMoaWorkspaces(cwd, { runId })
@@ -104,5 +129,20 @@ export async function stageCandidateRound1({
     onProgress,
   })
 
-  return { ok: true, referenceOutputs, successfulRefs }
+  let adversarialTddResult = null
+  if (preset?.adversarial_tdd_enabled) {
+    adversarialTddResult = await runAdversarialTddLoop({
+      cwd,
+      runId,
+      userPrompt: typeof lastMsgText === "string" ? lastMsgText : "",
+      referenceOutputs,
+      preset,
+      callLlm,
+      execFn,
+      onProgress,
+      signal,
+    })
+  }
+
+  return { ok: true, referenceOutputs, successfulRefs, adversarialTddResult }
 }

package/lib/pipeline/promotion.js

@@ -1,3 +1,4 @@
+import { classifyEloCategory } from '../moa-elo.js'
 import { runSelfHealingLoop } from '../moa-self-healing.js'
 import { logger } from '../logger.js'
 import { parseWinnerIndex, parseRecommendedAssembler } from '../moa-parser.js'
@@ -37,6 +38,7 @@ export async function stagePromotion({
   callLlm = null,
   onProgress = null,
   execFn = null,
+  visualResult = null,
 }) {
   const winningIndex = (multiJudgeResult?.consensus && multiJudgeResult?.winningCandidateIndex)
     ? multiJudgeResult.winningCandidateIndex
@@ -122,7 +124,7 @@ export async function stagePromotion({
 
   try {
     await recordMoaRunAsync({
-      id: runId, cwd, prompt: userPrompt, preset: preset?.name || 'default', isRefinement,
+      id: runId, cwd, prompt: userPrompt, category: classifyEloCategory(userPrompt), preset: preset?.name || 'default', isRefinement,
       candidates: candidatesForHistory(referenceOutputs),
       aggregator: { provider: chosenJudge.provider, model: chosenJudge.model, usage: aggUsage, costUsd: aggUsage.costUsd },
       winnerIndex: winningIndex, winnerModel, promotedFiles, benchmarkReport, consensus: multiJudgeResult,
@@ -147,7 +149,7 @@ export async function stagePromotion({
       kind: 'synthesis', content: synthesizedText, aggregator: isFastMode ? 'Fast Mode (Direct)' : finalAggLabel,
       references: referenceOutputs, presetName: preset?.name || 'default', isRefinement, isFastMode, isCuratorSynthesis,
       recommendedAssembler, winningIndex, winnerModel, promotedFiles, runId, allowCandidateOverride,
-      benchmarkReport, consensus: multiJudgeResult, fileScores, ...(selfHealingResult ? { selfHealing: selfHealingResult } : {}), ...(livePreview ? { liveCanvas: livePreview } : {}),
+      benchmarkReport, consensus: multiJudgeResult, fileScores, ...(selfHealingResult ? { selfHealing: selfHealingResult } : {}), ...(visualResult ? { visualConsensus: visualResult } : {}), ...(livePreview ? { liveCanvas: livePreview } : {}),
       usage: usageSummary, skippedFiles: collectedCtx?.skippedFiles || 0, skippedList: collectedCtx?.skippedList || [], durationMs,
     }
   }

package/lib/pipeline/runner.js

@@ -1,3 +1,5 @@
+import { buildAstCompositeMergeDirective } from '../moa-ast-merge.js'
+import { runVisualMoaConsensus } from '../moa-visual-consensus.js'
 import crypto from 'node:crypto'
 import { isTestEnvironment } from '../history.js'
 import { cleanMoaWorkspaces } from '../workspace/fs.js'
@@ -75,7 +77,7 @@ export async function runMoAPipeline({
     })
     return candStage.failurePayload
   }
-  const { referenceOutputs, successfulRefs } = candStage
+  const { referenceOutputs, successfulRefs, adversarialTddResult } = candStage
 
   for (const ref of referenceOutputs) {
     emitEvent(ctx, MOA_EVENTS.CANDIDATE_COMPLETE, {
@@ -154,12 +156,27 @@ export async function runMoAPipeline({
   if (!mjRes.ok) return mjRes.abortPayload
   const multiJudgeResult = mjRes.multiJudgeResult
 
-  const compositeMergeDirective = (preset?.composite_merge_enabled && successfulRefs.length > 1)
-    ? buildCompositeBlockDirectives(successfulRefs, { blind: Boolean(preset.blind_evaluation) })
-    : null
-  const fileScoringDirective = (preset?.interactive_workbench_enabled)
+  let compositeMergeDirective = null
+  if (preset?.ast_composite_merge_enabled && successfulRefs.length > 1) {
+    const astMerge = await buildAstCompositeMergeDirective(successfulRefs, { ctx, blind: Boolean(preset.blind_evaluation) })
+    compositeMergeDirective = astMerge.directive
+  } else if (preset?.composite_merge_enabled && successfulRefs.length > 1) {
+    compositeMergeDirective = buildCompositeBlockDirectives(successfulRefs, { blind: Boolean(preset.blind_evaluation) })
+  }
+  let visualResult = null
+  if (preset?.visual_moa_enabled) {
+    visualResult = await runVisualMoaConsensus({
+      ctx,
+      liveCanvas,
+      userPrompt,
+      referenceOutputs,
+      onProgress,
+    })
+  }
+  const rawFileDirective = (preset?.interactive_workbench_enabled)
     ? formatFileScoresDirective()
     : null
+  const fileScoringDirective = [rawFileDirective, visualResult?.directive, adversarialTddResult?.directive].filter(Boolean).join("\n\n") || null
 
   // Stage 7: Synthesis Phase
   const synthRes = await stageSynthesis({
@@ -189,7 +206,7 @@ export async function runMoAPipeline({
     promoteOpts, cwd, runId, signal, liveCanvas, startTime, chosenJudge, aggUsage,
     userPrompt, preset, isRefinement: ctxStage.isRefinement, isFastMode: ctxStage.isFastMode,
     effectiveReferences: ctxStage.effectiveReferences, referenceModels: ctxStage.referenceModels,
-    historyFilePath, collectedCtx: ctxStage.collectedCtx, ctx, callLlm, onProgress, execFn,
+    historyFilePath, collectedCtx: ctxStage.collectedCtx, ctx, callLlm, onProgress, execFn, visualResult,
   })
   if (!promRes.ok) {
     if (promRes.abort) return { error: promRes.error }

package/package.json

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