@goodandready/dsh-moa 0.2.14 → 0.2.15

package/docs/design/DESIGN.md

@@ -71,3 +71,9 @@
 - 2026-09-13 — Расширение функционала MoA (Gitea Issue #59): интерактивный селектор альтернативного кандидата в чате (User Candidate Override: allow_candidate_override), пакет из 10 специализированных пресетов с ролями кандидатов (role_persona), локальный гейт синтаксической проверки (Syntax Pre-check Gate) с директивой автоисправления синтаксиса судьёй, режим взаимного рецензирования («Консилиум» / Peer Critique Round 2: peer_critique_enabled), фильтрация лидерборда по пресетам и выгрузка телеметрии в CSV/JSON.
 
 - 2026-09-13 — Приведение локализации плагина в строгое соответствие со стандартами dhs-plugin-release-workflow и dsh-plugin-authoring (Gitea Issue #61): добавление полного китайского словаря (zh) в lib/client.js наряду с каноническим английским (en), удаление захардкоженных русских строк в серверной части (lib/moa-parser.js, lib/moa-runner.js), интернационализация эвристик в lib/file-workspace.js и lib/moa-prompts.js (en + zh), создание issue в goodandready/dsh-russian-lang для русификации.
+
+## 2026-09-15: Pipeline Stability & Quality Polish (#63)
+- **Refinement Context**: `formatProjectContext(files)` serializes workspace files as fenced Markdown code blocks. `moa-runner.js` passes collected files into `isRefinementTask(prompt, files)`.
+- **Round 2 Persistence**: Candidate file refinements from Round 2 are persisted to `.moa/candidate-N/` via `writeCandidateWorkspace`.
+- **AbortSignal Lifecycle**: `signal` is propagated end-to-end to terminate parallel LLM calls immediately when user aborts or disconnects.
+- **Token Protection**: Peer critique prompts summarize oversized competitor code blocks (>3000 chars) to prevent context window exhaustion.

package/docs/plans/63-stability-polish-plan.md

@@ -0,0 +1,15 @@
+# Implementation Plan - Issue #63: Pipeline Stability and Quality Polish
+
+## 1. Context & Objectives
+Polish runtime stability, error recovery, token efficiency, and file generation integrity across `@goodandready/dsh-moa`:
+1. **Refinement Context & Heuristic**: Fix `isRefinementTask` parameter handling in `moa-runner.js` and format collected files into Markdown code fences via `formatProjectContext(files)`, preventing `[object Object]` prompt injection.
+2. **Round 2 Workspace Sync**: Save refined files to `.moa/candidate-N/` in Consilium Round 2 so promoted winner files contain peer-critiqued code rather than stale Round 1 drafts.
+3. **End-to-End AbortSignal Propagation**: Propagate `signal` from `streamMoATurn` through `runMoAPipeline`, `runReferencesParallel`, Round 2 calls, and judge synthesis, cancelling in-flight requests and preventing token waste.
+4. **Context Window Protection**: Apply `stripOrSummarizeCode` in Round 2 peer review and judge synthesis prompts when candidate outputs exceed threshold.
+5. **Architectural Standard**: Maintain file size of `lib/moa-runner.js` strictly under 800 lines.
+
+## 2. Modules Impacted
+- `lib/file-workspace.js`: Add `formatProjectContext`, enhance `isRefinementTask`.
+- `lib/moa-prompts.js`: Context protection in `buildPeerCritiquePrompt` & `buildSynthesisPrompt`.
+- `lib/moa-runner.js`: `signal` propagation, Round 2 workspace persistence, refinement context formatting.
+- `test/`: Add regression tests for all fixes.

package/lib/file-workspace.js

@@ -90,6 +90,18 @@ function sanitizePath(filePath) {
  * Collects readable text files from current workspace to feed as context for candidate models (#6).
  * Ignores node_modules, .git, .moa, binary files, large bundles.
  */
+/**
+ * Formats collected project files into structured Markdown code blocks
+ * suitable for inclusion in candidate system prompts.
+ */
+export function formatProjectContext(projectFiles = []) {
+  if (!Array.isArray(projectFiles) || projectFiles.length === 0) return ''
+  const fence = '```'
+  return projectFiles
+    .map((f) => `### File: ${f.relativePath}\n${fence}\n${f.content}\n${fence}`)
+    .join('\n\n')
+}
+
 export async function collectProjectContext(baseDir, maxCharBudget = 16000) {
   if (!baseDir) return { files: [], totalChars: 0 }
 
@@ -145,8 +157,8 @@ export async function collectProjectContext(baseDir, maxCharBudget = 16000) {
  * Checks if a task prompt is an iterative refinement / modification
  * of an existing project rather than a greenfield project creation (#4).
  */
-export function isRefinementTask(userPrompt = '', projectFiles = []) {
-  if (!Array.isArray(projectFiles) || projectFiles.length === 0) return false
+export function isRefinementTask(userPrompt = '', projectFiles = null) {
+  if (Array.isArray(projectFiles) && projectFiles.length === 0) return false
   const p = userPrompt.toLowerCase().trim()
   if (!p) return false
 

package/lib/history.js

@@ -298,3 +298,13 @@ export function exportMoaHistory(filePath = DEFAULT_HISTORY_FILE, options = {})
     return options?.format === 'csv' ? '' : '[]'
   }
 }
+
+export 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,
+  }))
+}

package/lib/live-canvas.js

@@ -1,3 +1,25 @@
+import path from "node:path"
+
+export 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
+  }
+}
+
 /**
  * Optional Live Canvas preview client (@goodandready/dsh-live-canvas).
  *

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,27 +1,21 @@
 /**
  * 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
@@ -32,14 +26,16 @@ export const REFERENCE_SYSTEM_PROMPT = SYSTEM_ROLE_PROPOSER
 export async function callWithTransientRetry(callLlmFn, callArgs, maxRetries = 0, retryDelayMs = 1200) {
   let attempt = 0
   while (true) {
+    if (callArgs?.signal?.aborted) throw new Error('Aborted')
     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) {
+      if (attempt <= maxRetries && isTransient && !callArgs?.signal?.aborted) {
         await new Promise((r) => setTimeout(r, retryDelayMs))
+        if (callArgs?.signal?.aborted) throw new Error('Aborted')
         continue
       }
       throw err
@@ -66,6 +62,28 @@ export async function runReferencesParallel(references, messages, options = {},
   let finishedCount = 0
   const results = new Array(total)
   const abortControllers = references.map(() => new AbortController())
+  if (options.signal) {
+    if (options.signal.aborted) {
+      return references.map((r, i) => ({
+        index: i + 1,
+        provider: r.provider,
+        model: r.model,
+        label: slotLabel(r),
+        ok: false,
+        text: '(aborted)',
+        error: 'Turn aborted',
+        usage: { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
+        costUsd: 0,
+      }))
+    }
+    if (typeof options.signal.addEventListener === 'function') {
+      options.signal.addEventListener('abort', () => {
+        for (const ac of abortControllers) {
+          try { ac.abort(new Error('Turn aborted')) } catch {}
+        }
+      }, { once: true })
+    }
+  }
 
   let onTaskFinished = null
   const notifyFinished = () => {
@@ -221,35 +239,7 @@ export async function runReferencesParallel(references, messages, options = {},
   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
-  }
-}
 
 /**
  * Executes the full Mixture of Agents pipeline.
@@ -265,7 +255,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 +290,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 +323,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) {
@@ -518,6 +517,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 +525,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)
@@ -567,6 +568,7 @@ export async function runMoAPipeline({
         temperature: aggTemp,
         maxTokens,
         timeoutMs: aggTimeoutSec * 1000,
+        signal,
         onStreamDelta: (delta) => {
           if (isStreamAggregator && typeof onStreamDelta === 'function') {
             onStreamDelta(delta)
@@ -626,15 +628,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 +645,8 @@ export async function runMoAPipeline({
       winnerIndex: winningIndex,
       winnerModel,
       promotedFiles,
-      totalTokens,
-      totalCostUsd,
+      totalTokens: usageSummary.totalTokens,
+      totalCostUsd: usageSummary.totalCostUsd,
       durationMs,
     }, historyFilePath || undefined)
   } catch (histErr) {
@@ -670,12 +669,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 +710,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 }
+}

package/package.json

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