@goodandready/dsh-moa 0.2.10 → 0.2.11

package/README.md

@@ -199,6 +199,8 @@ dsh-moa:
 | `presets[].quorum_enabled` | `boolean` | `false` | Straggler mitigation: proceed with synthesis once >= 60% candidates respond |
 | `presets[].grace_period_sec` | `number` | `10` | Grace period in seconds to wait for stragglers after quorum is reached |
 | `presets[].aggregator_fallbacks` | `array` | `[]` | Ordered fallback judge models tried if primary aggregator encounters transient errors |
+| `presets[].reference_timeout_sec` | `number` | `60` | Per-candidate execution timeout in seconds |
+| `presets[].aggregator_timeout_sec` | `number` | `180` | Aggregator/judge synthesis timeout in seconds |
 | `presets[].reference_temperature` / `.aggregator_temperature` | `number` | `0.6` / `0.4` | Sampling temperatures for proposers and judge |
 | `presets[].max_tokens` | `number` | `4096` | Max output tokens per model call |
 | `presets[].judge_criteria` | `string` | `""` | Optional extra evaluation criteria passed to the judge |

package/docs/README.ru.md

@@ -199,6 +199,8 @@ dsh-moa:
 | `presets[].quorum_enabled` | `boolean` | `false` | Защита от зависших моделей (stragglers): запуск синтеза при ответе от >= 60% кандидатов |
 | `presets[].grace_period_sec` | `number` | `10` | Грейс-период (в секундах) ожидания оставшихся моделей после достижения кворума |
 | `presets[].aggregator_fallbacks` | `array` | `[]` | Список запасных моделей-судей при сбоях основной модели агрегатора |
+| `presets[].reference_timeout_sec` | `number` | `60` | Таймаут опроса каждого кандидата в секундах |
+| `presets[].aggregator_timeout_sec` | `number` | `180` | Таймаут синтеза решения судьей в секундах |
 | `presets[].reference_temperature` / `.aggregator_temperature` | `number` | `0.6` / `0.4` | Температуры сэмплирования советников и судьи |
 | `presets[].max_tokens` | `number` | `4096` | Максимум выходных токенов на вызов модели |
 | `presets[].judge_criteria` | `string` | `""` | Опциональные дополнительные критерии оценки для судьи |

package/docs/design/DESIGN.md

@@ -64,3 +64,5 @@
 
 
 - 2026-09-12 — Реализация кураторского синтеза (`curator_synthesis`), строгой рубрики антипаттернов (`ANTIPATTERNS_RUBRIC`), живого потокового стриминга куратора (`stream_aggregator`), кворума кандидатов с льготным периодом (`quorum_enabled`, `grace_period_sec`), авторетрая транзиентных ошибок (`callWithTransientRetry`) и цепочки запасных судей (`aggregator_fallbacks`). Все опции конфигурируются в пресетах с сохранением 100% обратной совместимости.
+
+- 2026-09-12 (вечер) — Декомпозиция lib/moa-runner.js на специализированные модули (`lib/moa-prompts.js`, `lib/moa-parser.js`, `lib/moa-runner.js`) с соблюдением канонического лимита <= 800 строк. Реализация автоматической ротации истории при превышении 10 МБ (`rotateHistoryFileIfNeeded`) и неблокирующего асинхронного сохранения (`recordMoaRunAsync`). Настраиваемые таймауты кандидатов и агрегатора (`reference_timeout_sec`, `aggregator_timeout_sec`).

package/docs/plans/55-resilience-plan.md

@@ -0,0 +1,33 @@
+# Task Plan: MoA Resilience, Async I/O, Configurable Timeouts and Modularization
+
+Issue: #55
+Branch: `feat/moa-resilience-refactor`
+Worktree: `/mnt/external/Project/DEV/dhsplugins/dsh-moa/.worktrees/feat/moa-resilience-refactor`
+
+## Objectives
+1. Modularize `lib/moa-runner.js` into clean, focused modules under 800 lines:
+   - `lib/moa-prompts.js`: Rubric, system prompts, synthesis and questionnaire prompts.
+   - `lib/moa-parser.js`: Output parsing, winner extraction, recommended assembler, file block extraction.
+   - `lib/moa-runner.js`: Focused pipeline orchestrator.
+2. Optimize storage in `lib/history.js`:
+   - Non-blocking async append via `fs.promises.appendFile`.
+   - File size rotation (>10MB or >5000 lines -> `.jsonl.1` backup).
+   - Fast tail reader for paginated history to avoid loading gigantic files in memory.
+3. Configurable timeouts in `lib/index.js` and `PresetSchema`:
+   - `reference_timeout_sec` (default: 60s).
+   - `aggregator_timeout_sec` (default: 180s).
+   - Forward timeouts into `callLlm` and `AbortController`.
+4. Fallback recovery on malformed judge output:
+   - When judge output is empty or truncated, cleanly fall back to `aggregator_fallbacks` before degrading.
+5. Verification & Tests:
+   - Add unit tests in `test/moa-resilience.test.mjs`.
+   - Verify existing 60/60 tests pass without regression.
+   - Update `docs/design/DESIGN.md` and README files.
+
+## Phases
+- [x] Phase 1: Planning & Setup (Issue #55, isolated worktree created, test suite verified)
+- [ ] Phase 2: Modularization of moa-runner (`lib/moa-prompts.js`, `lib/moa-parser.js`)
+- [ ] Phase 3: History Storage Rotation & Async I/O (`lib/history.js`)
+- [ ] Phase 4: Configurable Timeouts & Fallback Recovery (`lib/index.js`, `lib/moa-runner.js`)
+- [ ] Phase 5: Test Coverage & Verification (`test/moa-resilience.test.mjs`)
+- [ ] Phase 6: Documentation, PR, Merge, Release & Deploy

package/lib/history.js

@@ -1,7 +1,7 @@
 /**
  * MoA Run History & Analytics Module
  * Records every MoA pipeline execution, tracks model win rates and costs,
- * and provides history search and run replay capabilities.
+ * and provides history search, file rotation, and non-blocking I/O.
  */
 
 import fs from 'node:fs'
@@ -12,6 +12,9 @@ import crypto from 'node:crypto'
 const DEFAULT_HISTORY_DIR = path.join(os.homedir(), '.dsh')
 const DEFAULT_HISTORY_FILE = path.join(DEFAULT_HISTORY_DIR, 'moa-history.jsonl')
 
+/** Max history file size before rotation (10 MB) */
+export const MAX_HISTORY_BYTES = 10 * 1024 * 1024
+
 export function getHistoryFilePath(customDir) {
   if (customDir) {
     return path.join(customDir, '.moa-history.jsonl')
@@ -20,7 +23,67 @@ export function getHistoryFilePath(customDir) {
 }
 
 /**
- * Appends a completed MoA run record to the history file.
+ * Checks if the history file exceeds the size threshold and rotates it.
+ * Moves current file to `${filePath}.1`, removing any older `.1` backup.
+ */
+export function rotateHistoryFileIfNeeded(filePath = DEFAULT_HISTORY_FILE, maxBytes = MAX_HISTORY_BYTES) {
+  try {
+    if (!fs.existsSync(filePath)) return false
+    const stat = fs.statSync(filePath)
+    if (stat.size >= maxBytes) {
+      const backupPath = `${filePath}.1`
+      if (fs.existsSync(backupPath)) {
+        try { fs.unlinkSync(backupPath) } catch {}
+      }
+      fs.renameSync(filePath, backupPath)
+      return true
+    }
+  } catch (err) {
+    console.warn('[dsh-moa] History rotation warning:', err?.message || err)
+  }
+  return false
+}
+
+/**
+ * Prepares a normalized history record entry.
+ */
+function normalizeRunRecord(record) {
+  return {
+    id: record.id || crypto.randomUUID(),
+    timestamp: record.timestamp || new Date().toISOString(),
+    prompt: record.prompt || '',
+    preset: record.preset || 'default',
+    isRefinement: Boolean(record.isRefinement),
+    isFastMode: Boolean(record.isFastMode),
+    candidates: Array.isArray(record.candidates)
+      ? record.candidates.map((c) => ({
+          provider: c.provider || '',
+          model: c.model || '',
+          filesCount: Array.isArray(c.files) ? c.files.length : (c.filesCount || 0),
+          usage: c.usage || { inputTokens: 0, outputTokens: 0 },
+          costUsd: Number(c.costUsd || 0),
+        }))
+      : [],
+    aggregator: record.aggregator
+      ? {
+          provider: record.aggregator.provider || '',
+          model: record.aggregator.model || '',
+          usage: record.aggregator.usage || { inputTokens: 0, outputTokens: 0 },
+          costUsd: Number(record.aggregator.costUsd || 0),
+        }
+      : null,
+    winnerIndex: typeof record.winnerIndex === 'number' ? record.winnerIndex : -1,
+    winnerModel: record.winnerModel || '',
+    promotedFiles: Array.isArray(record.promotedFiles) ? record.promotedFiles : [],
+    totalTokens: Number(record.totalTokens || 0),
+    totalCostUsd: Number(record.totalCostUsd || 0),
+    durationMs: Number(record.durationMs || 0),
+  }
+}
+
+/**
+ * Appends a completed MoA run record to the history file synchronously (preserves sync API).
+ * Performs automatic size-based rotation.
  */
 export function recordMoaRun(record, filePath = DEFAULT_HISTORY_FILE) {
   try {
@@ -29,38 +92,9 @@ export function recordMoaRun(record, filePath = DEFAULT_HISTORY_FILE) {
       fs.mkdirSync(dir, { recursive: true })
     }
 
-    const entry = {
-      id: record.id || crypto.randomUUID(),
-      timestamp: record.timestamp || new Date().toISOString(),
-      prompt: record.prompt || '',
-      preset: record.preset || 'default',
-      isRefinement: Boolean(record.isRefinement),
-      isFastMode: Boolean(record.isFastMode),
-      candidates: Array.isArray(record.candidates)
-        ? record.candidates.map((c) => ({
-            provider: c.provider || '',
-            model: c.model || '',
-            filesCount: Array.isArray(c.files) ? c.files.length : (c.filesCount || 0),
-            usage: c.usage || { inputTokens: 0, outputTokens: 0 },
-            costUsd: Number(c.costUsd || 0),
-          }))
-        : [],
-      aggregator: record.aggregator
-        ? {
-            provider: record.aggregator.provider || '',
-            model: record.aggregator.model || '',
-            usage: record.aggregator.usage || { inputTokens: 0, outputTokens: 0 },
-            costUsd: Number(record.aggregator.costUsd || 0),
-          }
-        : null,
-      winnerIndex: typeof record.winnerIndex === 'number' ? record.winnerIndex : -1,
-      winnerModel: record.winnerModel || '',
-      promotedFiles: Array.isArray(record.promotedFiles) ? record.promotedFiles : [],
-      totalTokens: Number(record.totalTokens || 0),
-      totalCostUsd: Number(record.totalCostUsd || 0),
-      durationMs: Number(record.durationMs || 0),
-    }
+    rotateHistoryFileIfNeeded(filePath)
 
+    const entry = normalizeRunRecord(record)
     const line = JSON.stringify(entry) + '\n'
     fs.appendFileSync(filePath, line, 'utf8')
     return entry
@@ -70,6 +104,26 @@ export function recordMoaRun(record, filePath = DEFAULT_HISTORY_FILE) {
   }
 }
 
+/**
+ * Asynchronously appends a completed MoA run record without blocking the event loop.
+ */
+export async function recordMoaRunAsync(record, filePath = DEFAULT_HISTORY_FILE) {
+  try {
+    const dir = path.dirname(filePath)
+    await fs.promises.mkdir(dir, { recursive: true }).catch(() => {})
+
+    rotateHistoryFileIfNeeded(filePath)
+
+    const entry = normalizeRunRecord(record)
+    const line = JSON.stringify(entry) + '\n'
+    await fs.promises.appendFile(filePath, line, 'utf8')
+    return entry
+  } catch (err) {
+    console.warn('[dsh-moa] Failed to async-record run to history:', err)
+    return null
+  }
+}
+
 /**
  * Reads history runs with pagination (latest first).
  */
@@ -145,8 +199,6 @@ export function getMoaLeaderboard(filePath = DEFAULT_HISTORY_FILE) {
             st.totalTokens += inTok + outTok
             st.totalCostUsd += Number(cand.costUsd || 0)
 
-            // Exact match only: loose substring matching combined with empty
-            // candidate fields credited wins to every model in the run.
             if (winner && cand.model && (winner === key || winner === cand.model)) {
               st.wins += 1
             }

package/lib/index.js

@@ -56,6 +56,8 @@ export const PresetSchema = z.object({
   aggregator_fallbacks: z.array(ModelSlotSchema).default([]),
   reference_temperature: z.number().default(0.6),
   aggregator_temperature: z.number().default(0.4),
+  reference_timeout_sec: z.number().default(60),
+  aggregator_timeout_sec: z.number().default(180),
   max_tokens: z.number().default(4096),
   judge_criteria: z.string().default(''),
 })
@@ -156,7 +158,7 @@ export function apply(ctx, config) {
   /**
    * Unified LLM dispatch function using ctx.llm.prepareCall / stream
    */
-  const callLlm = async ({ provider, model, messages, temperature = 0.6, maxTokens = 4096, onStreamDelta }) => {
+  const callLlm = async ({ provider, model, messages, temperature = 0.6, maxTokens = 4096, timeoutMs, onStreamDelta }) => {
     if (!ctx.llm) {
       throw new Error('ctx.llm is not available in cordis context')
     }
@@ -180,8 +182,9 @@ export function apply(ctx, config) {
       throw new Error(`LLM provider/model ${provider}:${model} could not be prepared`)
     }
 
+    const effectiveTimeoutMs = typeof timeoutMs === 'number' && timeoutMs > 0 ? timeoutMs : 120000
     const abortCtrl = new AbortController()
-    const timeoutId = setTimeout(() => abortCtrl.abort(new Error('LLM call timeout')), 120000)
+    const timeoutId = setTimeout(() => abortCtrl.abort(new Error(`LLM call timeout after ${Math.round(effectiveTimeoutMs / 1000)}s`)), effectiveTimeoutMs)
     timeoutId.unref?.()
 
     try {

package/lib/moa-parser.js

@@ -0,0 +1,181 @@
+// lib/moa-parser.js
+// Parsers for model outputs, winner selection, commands, and code blocks for @goodandready/dsh-moa.
+
+/**
+ * Extracts candidate winner index from judge output.
+ * Looks for machine marker WINNER_CANDIDATE_INDEX: N first, then conversational fallbacks.
+ */
+export function parseWinnerIndex(judgeText, defaultIndex = 1, candidateCount = Infinity) {
+  if (!judgeText || typeof judgeText !== 'string') return defaultIndex
+  const inRange = (idx) => !isNaN(idx) && idx >= 1 && idx <= candidateCount
+  const match = /WINNER_CANDIDATE_INDEX:\s*(\d+)/i.exec(judgeText)
+  if (match) {
+    const idx = parseInt(match[1], 10)
+    if (inRange(idx)) return idx
+  }
+  const candMatch = /(?:Кандидат|Candidate|Reference)\s*(\d+)\b/i.exec(judgeText)
+  if (candMatch) {
+    const idx = parseInt(candMatch[1], 10)
+    if (inRange(idx)) return idx
+  }
+  return defaultIndex
+}
+
+/**
+ * Parses the recommended assembler model index and label from curator output.
+ */
+export function parseRecommendedAssembler(judgeText, defaultIndex = 1, candidateCount = Infinity) {
+  if (!judgeText || typeof judgeText !== 'string') return { index: defaultIndex, label: '' }
+  const inRange = (idx) => !isNaN(idx) && idx >= 1 && idx <= candidateCount
+  const match = /RECOMMENDED_ASSEMBLER:\s*(\d+)(?:\s*\(([^)]+)\))?/i.exec(judgeText)
+  if (match) {
+    const idx = parseInt(match[1], 10)
+    if (inRange(idx)) {
+      return { index: idx, label: match[2]?.trim() || '' }
+    }
+  }
+  return { index: defaultIndex, label: '' }
+}
+
+/**
+ * Parses a `/moa [preset] <prompt>` command invocation.
+ */
+export function parseMoACommand(text, presets = []) {
+  if (typeof text !== 'string' || !text.startsWith('/moa')) {
+    return null
+  }
+
+  const remainder = text.slice(4).trim()
+  if (!remainder) {
+    return {
+      presetName: 'default',
+      prompt: '',
+    }
+  }
+
+  const matchPreset = /^--preset(?:=|\s+)([a-zA-Z0-9_-]+)\s*(.*)/s.exec(remainder)
+  if (matchPreset) {
+    return {
+      presetName: matchPreset[1],
+      prompt: matchPreset[2] || '',
+    }
+  }
+
+  const parts = remainder.split(/\s+/)
+  const firstWord = parts[0]
+  if (Array.isArray(presets)) {
+    const matched = presets.find((p) => p.name === firstWord)
+    if (matched) {
+      return {
+        presetName: matched.name,
+        prompt: parts.slice(1).join(' ').trim(),
+      }
+    }
+  }
+
+  return {
+    presetName: 'default',
+    prompt: remainder,
+  }
+}
+
+/**
+ * Replaces large code blocks with concise file/code summaries to avoid token waste and huge chat dumps.
+ */
+export function stripOrSummarizeCode(text) {
+  if (!text || typeof text !== 'string') return ''
+  return text.replace(/```([a-zA-Z0-9_\-\.\/]*)\s*([\w\.\/\-]+\.[a-zA-Z0-9]+)?\n([\s\S]*?)```/g, (match, lang, fileTag, code) => {
+    const lines = code.trim().split('\n')
+    if (lines.length <= 3 && !/html|jsx|tsx|vue|svelte|css|js|ts/i.test(lang)) {
+      return match
+    }
+    const fileHint = fileTag || (code.match(/^\s*(?:\/\/|#|<!--|\/\*)\s*(?:file|filepath|path):\s*([^\s*]+)/im)?.[1])
+    const label = fileHint ? `file \`${fileHint}\`` : (lang ? `code \`${lang}\`` : 'code')
+    return `\n> 📄 *[${label} - ${lines.length} lines saved to disk]*\n`
+  })
+}
+
+/**
+ * Formats user-facing markdown response for synthesis, questions, and failure kinds.
+ */
+export function formatMoAResponse({ moaResult, presetName }) {
+  const parts = []
+  const pName = presetName || moaResult?.presetName || 'default'
+  const judge = moaResult?.aggregator || 'unknown'
+  const refs = moaResult?.references || []
+
+  if (moaResult?.kind === 'questions') {
+    parts.push('## 🧠 Mixture of Agents — Requirements Clarification')
+    parts.push(`*Judge (${judge}) and the advisors analyzed the task:*\n`)
+    parts.push(moaResult.content)
+    return parts.join('\n')
+  }
+
+  if (moaResult?.kind === 'failure') {
+    parts.push('## ⚠️ Mixture of Agents — Execution Failed')
+    parts.push(moaResult.content)
+    return parts.join('\n')
+  }
+
+  const modeBadge = moaResult?.isFastMode
+    ? '⚡ Fast Mode'
+    : (moaResult?.isCuratorSynthesis ? `🧠 Curator: ${judge}` : `Judge: ${judge}`)
+  parts.push(`## 🧠 Mixture of Agents (Preset: ${pName} | ${modeBadge})`)
+  parts.push('')
+
+  if (moaResult?.isRefinement) {
+    parts.push('> 🔄 **Mode**: Iterative project refinement (Refinement)')
+  }
+
+  const hasPromoted = moaResult?.promotedFiles && moaResult.promotedFiles.length > 0
+  if (hasPromoted) {
+    parts.push(`> 📦 **Files created in the project**: \`${moaResult.promotedFiles.join('`, `')}\``)
+  }
+
+  if (moaResult?.recommendedAssembler?.label) {
+    parts.push(`> 🎯 **Recommended Master Assembler**: Candidate ${moaResult.recommendedAssembler.index} (\`${moaResult.recommendedAssembler.label}\`)`)
+  }
+
+  if (moaResult?.liveCanvas?.previewUrl) {
+    parts.push(`> 🎨 **Live Canvas**: [🚀 Открыть ${moaResult.liveCanvas.title || 'превью'} в Live Canvas](${moaResult.liveCanvas.previewUrl}) | [↗ Открыть в новой вкладке](${moaResult.liveCanvas.previewUrl})`)
+  }
+
+  // Cost tracking card
+  if (moaResult?.usage) {
+    const u = moaResult.usage
+    const costStr = u.totalCostUsd > 0 ? `~\$${u.totalCostUsd.toFixed(4)}` : 'Free'
+    const tokStr = u.totalTokens >= 1000 ? `${(u.totalTokens / 1000).toFixed(1)}k` : `${u.totalTokens}`
+    parts.push(`> 💰 **Run cost**: ${costStr} (${tokStr} tokens total)`)
+  }
+
+  parts.push('')
+
+  if (!moaResult?.isFastMode) {
+    parts.push(`### ⚖️ Judge verdict and final synthesis (Synthesis: ${judge})`)
+    parts.push('')
+    const cleanJudgeContent = hasPromoted
+      ? stripOrSummarizeCode(moaResult?.content || '')
+      : (moaResult?.content || '(нет ответа)')
+    parts.push(cleanJudgeContent)
+    parts.push('')
+  }
+
+  if (Array.isArray(refs) && refs.length > 0) {
+    const title = moaResult?.isFastMode ? '### 🚀 Candidate generation result:' : `### 👥 Advisor responses (${refs.length}):`
+    parts.push(title)
+    parts.push('')
+    refs.forEach((ref, i) => {
+      const statusIcon = ref.ok ? '✅' : '⚠️'
+      const fileBadge = ref.files?.length ? ` (${ref.files.length} файл(ов))` : ''
+      const costBadge = ref.costUsd > 0 ? ` [~\$${ref.costUsd.toFixed(4)}]` : ''
+      parts.push(`#### ${statusIcon} Model ${i + 1}: ${ref.label}${fileBadge}${costBadge}`)
+      parts.push('')
+      parts.push(stripOrSummarizeCode(ref.text))
+      parts.push('')
+      parts.push('---')
+      parts.push('')
+    })
+  }
+
+  return parts.join('\n')
+}