@goodandready/dsh-moa 0.2.14 → 0.2.16

package/lib/moa-prompts.js

@@ -191,8 +191,11 @@ export function buildPeerCritiquePrompt(userPrompt, myProposal, otherProposals =
   const othersText = otherProposals
     .map((p, idx) => {
       const label = isBlind ? `Candidate ${idx + 1}` : (p.label || `Candidate ${idx + 1}`)
-      return `### ${label} Alternative Proposal:
-${p.text}`
+      let text = p.text || ''
+      if (text.length > 3000) {
+        text = stripOrSummarizeCode(text)
+      }
+      return `### ${label} Alternative Proposal:\n${text}`
     })
     .join('\n\n---\n\n')
 
@@ -224,7 +227,7 @@ export function buildCuratorSynthesisPrompt(userPrompt, referenceOutputs = [], j
         ? ` [Files created: ${r.files.map((f) => f.relativePath).join(', ')}]`
         : ''
       let textContent = r.text
-      if (referenceOutputs.length >= 3 && textContent.length > 3000) {
+      if (textContent.length > 3000) {
         textContent = stripOrSummarizeCode(textContent)
       }
       const syntaxNote = r.syntaxWarning ? ` [⚠️ Syntax Warning: ${r.syntaxWarning}]` : ''
@@ -291,7 +294,7 @@ export function buildSynthesisPrompt(userPrompt, referenceOutputs = [], judgeCri
         ? ` [Files created: ${r.files.map((f) => f.relativePath).join(', ')}]`
         : ''
       let textContent = r.text
-      if (referenceOutputs.length >= 3 && textContent.length > 3000) {
+      if (textContent.length > 3000) {
         textContent = stripOrSummarizeCode(textContent)
       }
       const syntaxNote = r.syntaxWarning ? ` [⚠️ Syntax Warning: ${r.syntaxWarning}]` : ''

package/lib/moa-runner.js

@@ -1,255 +1,30 @@
+import { bestEffort } from './best-effort.js'
 /**
  * DeepSeek Harness Mixture of Agents (MoA) — Runner Engine
- *
- * Implements the full ensemble pipeline:
- * - Parallel fan-out to reference models with transient retry & quorum straggler mitigation
- * - Prompt caching aligned message structures
- * - Curator synthesis & antipatterns evaluation
- * - Aggregator fallback chain for resilience & malformed output recovery
- * - Live token streaming for aggregator
- * - File promotion & Live Canvas sandbox preview
+ * Parallel fan-out, Consilium Round 2 peer critique, aggregator synthesis & streaming.
  */
 
 import path from 'node:path'
 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 { extractFileBlocks, collectProjectContext, formatProjectContext, isRefinementTask, writeCandidateWorkspace, promoteCandidateWorkspace, cleanMoaWorkspaces, verifyFileSyntax } from './file-workspace.js'
+import { estimateTokenCost, summarizeMoAUsage } from './pricing.js'
+import { recordMoaRun, recordMoaRunAsync, candidatesForHistory } from './history.js'
+import { createPromotedPreview } from './live-canvas.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 { estimateTokenCost, summarizeMoAUsage } from './pricing.js'
 
-export const DEFAULT_PROMPT = 'Please propose an optimal, well-structured, production-ready solution with full code and explanations.'
-export const REFERENCE_SYSTEM_PROMPT = SYSTEM_ROLE_PROPOSER
+const DEFAULT_PROMPT = 'Please propose an optimal, well-structured, production-ready solution with full code and explanations.'
 
 /**
  * Invokes LLM call with transient retry for recoverable network/rate-limit errors.
  */
-export async function callWithTransientRetry(callLlmFn, callArgs, maxRetries = 0, retryDelayMs = 1200) {
-  let attempt = 0
-  while (true) {
-    try {
-      return await callLlmFn(callArgs)
-    } catch (err) {
-      attempt++
-      const msg = err?.message || String(err)
-      const isTransient = /429|rate limit|502|503|504|econnreset|etimedout|socket hang up/i.test(msg)
-      if (attempt <= maxRetries && isTransient) {
-        await new Promise((r) => setTimeout(r, retryDelayMs))
-        continue
-      }
-      throw err
-    }
-  }
-}
-
-/**
- * Dispatches queries to all reference models in parallel with transient retry and quorum straggler mitigation.
- */
-export async function runReferencesParallel(references, messages, options = {}, callLlm, onProgress) {
-  if (!Array.isArray(references) || references.length === 0) {
-    return []
-  }
-
-  const advisoryMessages = cleanAdvisoryMessages(messages)
-  const systemPrompt = options.systemPrompt || REFERENCE_SYSTEM_PROMPT
-  const timeoutMs = options.timeoutMs ?? ((options.timeoutSec ?? 60) * 1000)
-  const maxRetries = options.maxRetries ?? 0
-  const quorumEnabled = Boolean(options.quorumEnabled)
-  const gracePeriodMs = (options.gracePeriodSec ?? 10) * 1000
-
-  const total = references.length
-  let finishedCount = 0
-  const results = new Array(total)
-  const abortControllers = references.map(() => new AbortController())
-
-  let onTaskFinished = null
-  const notifyFinished = () => {
-    if (typeof onTaskFinished === 'function') onTaskFinished()
-  }
-
-  if (typeof onProgress === 'function') {
-    onProgress(`⚡ *Launching ${total} candidate models in parallel...*\n`)
-  }
-
-  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 {
-        const callPromise = callWithTransientRetry(
-          callLlm,
-          {
-            provider: slot.provider,
-            model: slot.model,
-            messages: slotMessages,
-            temperature: options.temperature ?? 0.6,
-            maxTokens: options.maxTokens ?? 4096,
-            timeoutMs,
-            signal: abortControllers[i].signal,
-          },
-          maxRetries
-        )
-
-        const timeoutPromise = new Promise((_, reject) => {
-          const timer = setTimeout(() => reject(new Error(`Timeout after ${Math.round(timeoutMs / 1000)}s`)), timeoutMs)
-          timer.unref?.()
-          abortControllers[i].signal.addEventListener('abort', () => clearTimeout(timer), { once: true })
-        })
-
-        const res = await Promise.race([callPromise, timeoutPromise])
-        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(slotMessages.map((m) => m.content).join('').length / 4)),
-          outputTokens: Math.max(1, Math.round(text.length / 4)),
-        }
-        const costInfo = estimateTokenCost(slot, fallbackUsage, options.prices)
-
-        finishedCount++
-        if (typeof onProgress === 'function') {
-          const costStr = costInfo.costUsd > 0 ? ` (~\$${costInfo.costUsd.toFixed(4)})` : ''
-          onProgress(`✅ *Candidate ${i + 1}/${total} (${label}) finished${costStr}*\n`)
-        }
-
-        results[i] = {
-          index: i + 1,
-          slot,
-          label,
-          text,
-          usage: costInfo,
-          costUsd: costInfo.costUsd,
-          ok: true,
-        }
-      } catch (err) {
-        finishedCount++
-        const errMsg = err?.message || String(err)
-        console.warn(`[dsh-moa] Reference ${label} failed:`, errMsg)
-        if (typeof onProgress === 'function') {
-          onProgress(`⚠️ *Candidate ${i + 1}/${total} (${label}) error: ${errMsg}*\n`)
-        }
-        results[i] = {
-          index: i + 1,
-          slot,
-          label,
-          text: `[Model ${label} error: ${errMsg}]`,
-          usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0, costUsd: 0 },
-          costUsd: 0,
-          ok: false,
-          error: errMsg,
-        }
-      } finally {
-        notifyFinished()
-      }
-    }
-
-    runOne()
-  })
-
-  // Straggler mitigation via Quorum + Grace Period
-  if (quorumEnabled && total >= 3) {
-    const quorumTarget = Math.max(2, Math.min(total - 1, Math.ceil(total * 0.6)))
-    let graceTimer = null
-
-    await new Promise((resolve) => {
-      const checkQuorum = () => {
-        if (finishedCount >= total) {
-          if (graceTimer) clearTimeout(graceTimer)
-          resolve()
-          return
-        }
-
-        if (finishedCount >= quorumTarget && !graceTimer) {
-          if (typeof onProgress === 'function') {
-            onProgress(`⏳ *Quorum reached (${finishedCount}/${total}). Starting ${Math.round(gracePeriodMs / 1000)}s grace period for stragglers...*\n`)
-          }
-          graceTimer = setTimeout(() => {
-            if (typeof onProgress === 'function' && finishedCount < total) {
-              onProgress(`⏩ *Grace period expired. Proceeding with ${finishedCount}/${total} ready candidates.*\n`)
-            }
-            for (let k = 0; k < total; k++) {
-              if (!results[k]) {
-                try { abortControllers[k].abort(new Error('Quorum grace period timed out')) } catch {}
-              }
-            }
-            resolve()
-          }, gracePeriodMs)
-          graceTimer.unref?.()
-        }
-      }
-
-      onTaskFinished = checkQuorum
-      checkQuorum()
-    })
-
-    for (let i = 0; i < total; i++) {
-      if (!results[i]) {
-        const slot = references[i]
-        const label = slotLabel(slot)
-        results[i] = {
-          index: i + 1,
-          slot,
-          label,
-          text: `[Model ${label} timed out (quorum grace period exceeded)]`,
-          usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0, costUsd: 0 },
-          costUsd: 0,
-          ok: false,
-          error: 'Quorum grace period timed out',
-        }
-      }
-    }
-    return results
-  }
-
-  // Standard mode: wait for all tasks to complete
-  await new Promise((resolve) => {
-    const checkAll = () => {
-      if (finishedCount >= total) resolve()
-    }
-    onTaskFinished = checkAll
-    checkAll()
-  })
-
-  return results
-}
-
-function candidatesForHistory(referenceOutputs) {
-  return (referenceOutputs || []).map((r) => ({
-    provider: r.slot?.provider || '',
-    model: r.slot?.model || '',
-    files: (r.files || []).map((f) => f.relativePath),
-    usage: r.usage || { inputTokens: 0, outputTokens: 0 },
-    costUsd: r.costUsd || 0,
-  }))
-}
-
-async function createPromotedPreview(liveCanvas, cwd, promotedFiles, referenceOutputs) {
-  if (!liveCanvas || typeof liveCanvas.createPreviewFromContent !== 'function') return null
-  const htmlRel = (promotedFiles || []).find((f) => f.endsWith('.html') || f.endsWith('.htm'))
-  if (!htmlRel) return null
-  let content = null
-  for (const r of referenceOutputs || []) {
-    const block = (r?.files || []).find((f) => f.relativePath === htmlRel)
-    if (block?.content) {
-      content = block.content
-      break
-    }
-  }
-  if (!content) return null
-  try {
-    return await liveCanvas.createPreviewFromContent({ content, title: htmlRel, filePath: path.join(cwd, htmlRel) })
-  } catch {
-    return null
-  }
-}
+import { REFERENCE_SYSTEM_PROMPT, callWithTransientRetry, runReferencesParallel } from './moa-candidates.js'
+export { REFERENCE_SYSTEM_PROMPT, callWithTransientRetry, runReferencesParallel }
 
 /**
  * Executes the full Mixture of Agents pipeline.
@@ -265,7 +40,9 @@ export async function runMoAPipeline({
   historyFilePath = null,
   liveCanvas = null,
   onStreamDelta = null,
+  signal = null,
 }) {
+  if (signal?.aborted) return { error: new Error('Turn aborted') }
   const startTime = Date.now()
 
   // 1. Resolve configurations
@@ -298,13 +75,14 @@ export async function runMoAPipeline({
   const runId = crypto.randomUUID()
 
   // 2. Collect project context for refinement tasks
-  const isRefinement = isRefinementTask(userPrompt)
+  const collectedCtx = await collectProjectContext(cwd, 16000)
+  const isRefinement = Boolean(collectedCtx?.files?.length > 0 && isRefinementTask(userPrompt, collectedCtx.files))
   let projectContext = ''
   if (isRefinement) {
     if (typeof onProgress === 'function') {
       onProgress('🔍 *Reading project files for refinement context...*\n')
     }
-    projectContext = await collectProjectContext(cwd, 16000)
+    projectContext = formatProjectContext(collectedCtx.files)
   }
 
   // 3. Build prompts & evaluate broad questionnaire needs
@@ -330,11 +108,17 @@ export async function runMoAPipeline({
       quorumEnabled: isQuorumEnabled,
       gracePeriodSec,
       maxRetries: candidateRetries,
+      signal,
     },
     callLlm,
     onProgress
   )
 
+  if (signal?.aborted) {
+    await cleanMoaWorkspaces(cwd)
+    return { error: new Error('Turn aborted') }
+  }
+
   // Fail fast if all candidates failed
   const successfulRefs = referenceOutputs.filter((r) => r.ok)
   if (successfulRefs.length === 0) {
@@ -422,7 +206,9 @@ export async function runMoAPipeline({
         totalCostUsd,
         durationMs,
       }, historyFilePath || undefined)
-    } catch {}
+    } catch (histErr) {
+      console.warn('[dsh-moa] Failed to record questionnaire run in history:', histErr?.message || histErr)
+    }
 
     return {
       kind: 'questions',
@@ -475,7 +261,9 @@ export async function runMoAPipeline({
         totalCostUsd,
         durationMs,
       }, historyFilePath || undefined)
-    } catch {}
+    } catch (histErr) {
+      console.warn('[dsh-moa] Failed to record fast synthesis run in history:', histErr?.message || histErr)
+    }
 
     return {
       kind: 'synthesis',
@@ -518,6 +306,7 @@ export async function runMoAPipeline({
           temperature: refTemp,
           maxTokens,
           timeoutMs: refTimeoutSec * 1000,
+          signal,
         }, candidateRetries)
         const refinedText = typeof res === 'string' ? res : (res?.content || res?.text || cand.text)
         cand.text = refinedText
@@ -525,6 +314,7 @@ export async function runMoAPipeline({
         if (r2Files.length > 0) {
           cand.files = r2Files
           cand.syntaxWarning = (verifyFileSyntax(r2Files) || []).map((w) => `${w.file}: ${w.error}`).join('; ')
+          await writeCandidateWorkspace(cwd, cand.index, r2Files)
         }
         if (typeof res === 'object' && res?.usage) {
           cand.usage.inputTokens = (cand.usage.inputTokens || 0) + (res.usage.inputTokens || 0)
@@ -533,7 +323,9 @@ export async function runMoAPipeline({
           const extraCost = estimateTokenCost(slot, res.usage, prices)
           cand.costUsd = Number(((cand.costUsd || 0) + extraCost.costUsd).toFixed(5))
         }
-      } catch {}
+      } catch (r2CostErr) {
+        console.warn('[dsh-moa] Failed to estimate Round 2 cost:', r2CostErr?.message || r2CostErr)
+      }
     })
     await Promise.allSettled(r2Promises)
   }
@@ -567,6 +359,7 @@ export async function runMoAPipeline({
         temperature: aggTemp,
         maxTokens,
         timeoutMs: aggTimeoutSec * 1000,
+        signal,
         onStreamDelta: (delta) => {
           if (isStreamAggregator && typeof onStreamDelta === 'function') {
             onStreamDelta(delta)
@@ -626,15 +419,12 @@ export async function runMoAPipeline({
 
   const livePreview = await createPromotedPreview(liveCanvas, cwd, promotedFiles, referenceOutputs)
 
-  const totalTokens = referenceOutputs.reduce((acc, r) => acc + (r.usage?.totalTokens || 0), 0) + aggUsage.totalTokens
-  const totalCostUsd = Number((referenceOutputs.reduce((acc, r) => acc + (r.costUsd || 0), 0) + aggUsage.costUsd).toFixed(5))
   const durationMs = Date.now() - startTime
-
+  const usageSummary = summarizeMoAUsage(referenceOutputs, aggUsage)
   const winningRef = referenceOutputs[winningIndex - 1]
   const winnerModel = winningRef?.label || slotLabel(referenceModels[0])
   const finalAggLabel = slotLabel(chosenJudge)
 
-  // Record run to history
   try {
     recordMoaRun({
       id: runId,
@@ -646,8 +436,8 @@ export async function runMoAPipeline({
       winnerIndex: winningIndex,
       winnerModel,
       promotedFiles,
-      totalTokens,
-      totalCostUsd,
+      totalTokens: usageSummary.totalTokens,
+      totalCostUsd: usageSummary.totalCostUsd,
       durationMs,
     }, historyFilePath || undefined)
   } catch (histErr) {
@@ -670,12 +460,7 @@ export async function runMoAPipeline({
     runId,
     allowCandidateOverride,
     ...(livePreview ? { liveCanvas: livePreview } : {}),
-    usage: {
-      totalTokens,
-      totalCostUsd,
-      candidates: referenceOutputs.map((r) => ({ label: r.label, usage: r.usage, costUsd: r.costUsd })),
-      aggregator: aggUsage,
-    },
+    usage: usageSummary,
     durationMs,
   }
 }
@@ -716,6 +501,7 @@ export async function* streamMoATurn({ targetPreset, userPrompt, messages, callL
     prices,
     historyFilePath,
     liveCanvas,
+    signal,
   })
     .catch((err) => ({ error: err }))
     .finally(() => {

package/lib/pricing.js

@@ -205,4 +205,13 @@ export function estimateTokenCost(slot = {}, usage = {}, customPrices = {}, cach
     rates,
   }
 }
-
+
+
+
+export function summarizeMoAUsage(referenceOutputs = [], aggUsage = null) {
+  const normAgg = aggUsage || { inputTokens: 0, outputTokens: 0, totalTokens: 0, costUsd: 0 }
+  const totalTokens = (referenceOutputs || []).reduce((acc, r) => acc + (r.usage?.totalTokens || 0), 0) + normAgg.totalTokens
+  const totalCostUsd = Number(((referenceOutputs || []).reduce((acc, r) => acc + (r.costUsd || 0), 0) + normAgg.costUsd).toFixed(5))
+  const candidates = (referenceOutputs || []).map((r) => ({ label: r.label, usage: r.usage, costUsd: r.costUsd }))
+  return { totalTokens, totalCostUsd, candidates, aggregator: normAgg }
+}