@goodandready/dsh-moa 0.2.13 → 0.2.15

package/docs/design/DESIGN.md

@@ -69,3 +69,11 @@
 - 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`).
 
 - 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/client.js

@@ -60,6 +60,11 @@ window.__ModuleLoader__.load({
       'aggregator.override_label': 'Allow Candidate Override Actions',
       'aggregator.override_hint': 'Keeps candidate workspaces in .moa to let you apply any candidate files via chat command.',
       'proposers.role_label': 'Persona:',
+      'proposers.role_general': 'General',
+      'proposers.role_minimalist': 'Minimalist',
+      'proposers.role_robustness': 'Robustness',
+      'proposers.role_performance': 'Performance',
+      'proposers.role_tester': 'Tester',
       'leaderboard.filter_all': 'All Presets',
       'leaderboard.export_csv': 'Export CSV',
       'leaderboard.export_json': 'Export JSON',
@@ -110,6 +115,99 @@ window.__ModuleLoader__.load({
       'slash.desc': 'Run turn with Mixture of Agents ensemble synthesis (/moa [preset] <prompt>)',
     }
 
+    const zh = {
+      title: '智能体混合 (MoA)',
+      description: '多模型协同编排：通过 /moa <提示词> 进行候选模型并行提案与主裁判综合。',
+      'header.title': '智能体混合 (MoA) 编排系统',
+      'header.sub': '由多个候选提案模型并行生成方案，再由领先的聚合裁判模型进行终审评测与代码提拔。完成后自动切回您的会话模型。',
+      'badge.online': 'MoA 已启用',
+      'badge.offline': '主机不可达',
+      'badge.preset': '预设：{name}',
+      'badge.models': '{count} 个可用模型',
+      'badge.candidates': '{count} 个提案模型',
+      'presets.title': '📋 预设管理',
+      'presets.desc': '选择当前活动预设或针对特定任务（如代码审查、数学推演、快速分流）创建自定义配置。',
+      'presets.active_badge': '默认激活',
+      'presets.set_default': '设为默认',
+      'presets.new_btn': '+ 新建预设',
+      'presets.del_btn': '删除',
+      'presets.del_confirm': '确定要删除预设“{name}”吗？',
+      'presets.create': '创建',
+      'presets.cancel': '取消',
+      'presets.name_placeholder': '新预设名称（例如：fast-audit）',
+      'aggregator.title': '⚖️ 领先模型 / 裁判（综合与审计）',
+      'aggregator.desc': '对比候选方案，消除差异，过滤幻觉，并综合生成最终生产级解决方案。',
+      'aggregator.temp_label': '裁判采样温度 (Temperature)',
+      'aggregator.temp_hint': '推荐：0.2 – 0.4，以确保严格的验证和确定性的代码综合。',
+      'aggregator.criteria_label': '裁判评测标准（可选）：',
+      'aggregator.criteria_placeholder': '例如：优先考虑高性能、零外部依赖、完善的边界异常处理...',
+      'aggregator.questions_label': '对于宽泛任务先提出澄清问题（需求问卷）',
+      'aggregator.questions_hint': '启用时：对于简短或模糊的任务，裁判在生成代码前会先综合一份包含 2–4 个问题的选项清单。',
+      'aggregator.curator_label': '策展人综合与主组装模型建议',
+      'aggregator.curator_hint': '启用时：策展人会提炼每个候选方案的精华部分，应用反模式清单，并建议由哪个智能体模型组装最终方案。',
+      'aggregator.stream_label': '实时流式传输裁判/策展人思考过程',
+      'aggregator.stream_hint': '将裁判生成的思考过程实时推送到聊天框，实现零延迟首字响应。',
+      'aggregator.peer_label': '决策评议会：候选模型交叉互评（第二轮 Consilium）',
+      'aggregator.peer_hint': '在主裁判终审前，各候选模型互相审阅并改进彼此的方案代码。',
+      'aggregator.override_label': '允许手动候选方案提拔操作 (Override)',
+      'aggregator.override_hint': '在 .moa 目录中保留候选模型的工作区，允许通过聊天命令提拔任意候选模型的文件。',
+      'proposers.role_label': '工程角色画像：',
+      'proposers.role_general': '通用平衡 (General)',
+      'proposers.role_minimalist': '极简标准库 (Minimalist)',
+      'proposers.role_robustness': '防御鲁棒 (Robustness)',
+      'proposers.role_performance': '极致性能 (Performance)',
+      'proposers.role_tester': '测试驱动 (Tester)',
+      'leaderboard.filter_all': '全部预设',
+      'leaderboard.export_csv': '导出 CSV',
+      'leaderboard.export_json': '导出 JSON',
+      'aggregator.blind_label': '盲审模式（对裁判隐藏候选模型名称）',
+      'aggregator.blind_hint': '启用时：从裁判提示词中匿名化候选模型的提供商和名称，杜绝品牌偏见。',
+      'aggregator.timeout_label': '裁判综合超时时长（秒）：',
+      'proposers.timeout_label': '候选模型生成超时时长（秒）：',
+      'leaderboard.title': '🏆 模型胜率排行榜',
+      'leaderboard.desc': '基于历史记录的 MoA 裁判评测判决数据统计指标。',
+      'leaderboard.model': '模型',
+      'leaderboard.runs': '运行次数',
+      'leaderboard.wins': '胜出次数',
+      'leaderboard.winrate': '胜率',
+      'leaderboard.cost': '平均成本',
+      'leaderboard.empty': '暂无历史运行记录。',
+      'aggregator.fallbacks_title': '备用裁判链',
+      'aggregator.fallbacks_desc': '当主裁判触发速率限制或服务不可用时，自动顺序调用的备用模型。',
+      'aggregator.add_fallback_btn': '+ 添加备用裁判',
+      'proposers.quorum_label': '法定人数快进（防拖尾模型机制）',
+      'proposers.quorum_hint': '当 67% 以上候选模型完成时，开启缓冲定时器（默认 10 秒），不再死等卡顿的模型。',
+      'proposers.grace_label': '缓冲等待时长（秒）：',
+      'proposers.title': '👥 候选提案模型 (Proposers)',
+      'proposers.desc': '并行生成互相独立的解决方案，最大化思路多样性与解空间覆盖度。',
+      'proposers.parallel_count': '并行提案模型数量',
+      'proposers.candidate': '候选模型',
+      'proposers.add_btn': '+ 添加候选模型',
+      'proposers.temp_label': '候选模型采样温度 (Temperature)',
+      'proposers.temp_hint': '推荐：0.6 – 0.8，鼓励创造性、发散性的独立探索。',
+      'stats.title': '📈 MoA 数据分析与遥测',
+      'stats.desc': '会话遥测、历史运行追踪及模型胜率统计。',
+      'stats.total_runs': '总运行次数',
+      'stats.avg_cost': '平均每次成本',
+      'stats.active_models': '已配置模型数',
+      'stats.preset_count': '预设总数',
+      'picker.select': '选择模型…',
+      'picker.search_placeholder': '按名称或提供商搜索模型…',
+      'picker.found': '找到',
+      'picker.of': '共',
+      'picker.clear': '清除',
+      'picker.none': '未找到匹配的模型。',
+      'picker.custom': '使用自定义：',
+      'actions.save': '保存配置',
+      'actions.saving': '正在保存…',
+      'actions.saved': '配置已成功保存！',
+      'actions.retry': '重新加载配置',
+      'badge.disabled': 'MoA 已禁用',
+      'config.enabled_label': '启用 MoA（斜杠命令与轮次拦截路由）',
+      'slash.desc': '使用智能体混合 (MoA) 协同综合运行此轮次 (/moa [预设] <提示词>)',
+    }
+
+
     function makeT(dict, fallback) {
       return function t(key, vars) {
         let val = (dict && dict[key]) || (fallback && fallback[key]) || key
@@ -1110,11 +1208,11 @@ window.__ModuleLoader__.load({
                       })
                     },
                   },
-                  React.createElement('option', { value: 'general' }, 'General'),
-                  React.createElement('option', { value: 'minimalist' }, 'Minimalist'),
-                  React.createElement('option', { value: 'robustness' }, 'Robustness'),
-                  React.createElement('option', { value: 'performance' }, 'Performance'),
-                  React.createElement('option', { value: 'tester' }, 'Tester')
+                  React.createElement('option', { value: 'general' }, t('proposers.role_general') || 'General'),
+                  React.createElement('option', { value: 'minimalist' }, t('proposers.role_minimalist') || 'Minimalist'),
+                  React.createElement('option', { value: 'robustness' }, t('proposers.role_robustness') || 'Robustness'),
+                  React.createElement('option', { value: 'performance' }, t('proposers.role_performance') || 'Performance'),
+                  React.createElement('option', { value: 'tester' }, t('proposers.role_tester') || 'Tester')
                 ),
                 currentRefs.length > 1 &&
                   React.createElement(
@@ -1229,7 +1327,7 @@ window.__ModuleLoader__.load({
                     className: 'moa-btn',
                     style: { height: 26, fontSize: 11, padding: '0 8px', textDecoration: 'none', display: 'inline-flex', alignItems: 'center' },
                   },
-                  'CSV'
+                  t('leaderboard.export_csv') || 'CSV'
                 ),
                 React.createElement(
                   'a',
@@ -1239,7 +1337,7 @@ window.__ModuleLoader__.load({
                     className: 'moa-btn',
                     style: { height: 26, fontSize: 11, padding: '0 8px', textDecoration: 'none', display: 'inline-flex', alignItems: 'center' },
                   },
-                  'JSON'
+                  t('leaderboard.export_json') || 'JSON'
                 )
               )
             ),
@@ -1628,7 +1726,7 @@ window.__ModuleLoader__.load({
 
       if (typeof ctx.effect === 'function') {
         ctx.effect(() => {
-          const undo = [addLocale('en', en)]
+          const undo = [addLocale('en', en), addLocale('zh', zh)]
           return () => {
             for (const off of undo) {
               if (typeof off === 'function') {

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,17 +157,17 @@ 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
 
   // Greenfield creation phrases - ALWAYS fresh task
   const freshPhrases = [
-    'с нуля', 'from scratch', 'новый проект', 'новое приложение', 'new project', 'new app',
-    'создай проект', 'создай приложение', 'создай игру', 'создай сервис',
+    'from scratch', 'new project', 'new app', 'create a new', 'build a new', 'generate a new',
+    '从头开始', '新建项目', '创建项目', '新应用', '新建应用',
+    'с нуля', 'новый проект', 'новое приложение', 'создай проект', 'создай приложение', 'создай игру', 'создай сервис',
     'сделай проект', 'сделай приложение', 'сделай игру',
-    'create a new', 'build a new', 'generate a new',
   ]
   if (freshPhrases.some((phrase) => p.includes(phrase))) {
     return false
@@ -163,9 +175,11 @@ export function isRefinementTask(userPrompt = '', projectFiles = []) {
 
   // Modification keywords
   const modKeywords = [
-    'добавь', 'измени', 'поменяй', 'исправь', 'обнови', 'переделай', 'доработай', 'удали',
     'add', 'change', 'update', 'fix', 'modify', 'refactor', 'improve', 'enhance', 'adjust',
-    'style', 'css', 'темн', 'светл', 'color', 'цвет', 'кнопк', 'theme', 'bug', 'баг',
+    'style', 'css', 'color', 'theme', 'bug',
+    '添加', '修改', '更新', '修复', '重构', '改进', '调整', '样式', '颜色', '主题',
+    'добавь', 'измени', 'поменяй', 'исправь', 'обнови', 'переделай', 'доработай', 'удали',
+    'темн', 'светл', 'цвет', 'кнопк', 'баг',
   ]
 
   return modKeywords.some((kw) => p.includes(kw))

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-parser.js

@@ -148,7 +148,7 @@ export function formatMoAResponse({ moaResult, presetName }) {
   }
 
   if (moaResult?.liveCanvas?.previewUrl) {
-    parts.push(`> 🎨 **Live Canvas**: [🚀 Открыть ${moaResult.liveCanvas.title || 'превью'} в Live Canvas](${moaResult.liveCanvas.previewUrl}) | [↗ Открыть в новой вкладке](${moaResult.liveCanvas.previewUrl})`)
+    parts.push(`> 🎨 **Live Canvas**: [🚀 Open ${moaResult.liveCanvas.title || 'preview'} in Live Canvas](${moaResult.liveCanvas.previewUrl}) | [↗ Open in new tab](${moaResult.liveCanvas.previewUrl})`)
   }
 
   // Cost tracking card
@@ -166,7 +166,7 @@ export function formatMoAResponse({ moaResult, presetName }) {
     parts.push('')
     const cleanJudgeContent = hasPromoted
       ? stripOrSummarizeCode(moaResult?.content || '')
-      : (moaResult?.content || '(нет ответа)')
+      : (moaResult?.content || '(no response)')
     parts.push(cleanJudgeContent)
     parts.push('')
   }
@@ -177,7 +177,7 @@ export function formatMoAResponse({ moaResult, presetName }) {
     parts.push('')
     refs.forEach((ref, i) => {
       const statusIcon = ref.ok ? '✅' : '⚠️'
-      const fileBadge = ref.files?.length ? ` (${ref.files.length} файл(ов))` : ''
+      const fileBadge = ref.files?.length ? ` (${ref.files.length} file${ref.files.length > 1 ? 's' : ''})` : ''
       const costBadge = ref.costUsd > 0 ? ` [~\$${ref.costUsd.toFixed(4)}]` : ''
       parts.push(`#### ${statusIcon} Model ${i + 1}: ${ref.label}${fileBadge}${costBadge}`)
       parts.push('')

package/lib/moa-prompts.js

@@ -128,21 +128,22 @@ export function isBroadPromptRequiringQuestions(userPrompt = '', messages = [])
   const p = userPrompt.trim()
   const wordCount = p.split(/\s+/).length
 
-  if (/^(да|нет|1|2|3|4|ок|погнали|давай|yes|no)\b/i.test(p) && wordCount <= 5) {
+  if (/^(yes|no|1|2|3|4|ok|sure|是|否|好|да|нет|ок|погнали|давай)\b/i.test(p) && wordCount <= 5) {
     return false
   }
 
   const hasRecentQuestion = messages.some((m) => {
     const text = typeof m?.content === 'string' ? m.content : JSON.stringify(m?.content || '')
-    return text.includes('Уточнение требований') || text.includes('опросник') || text.includes('Вариант 1')
+    return text.includes('Clarification of Requirements') || text.includes('需求澄清') || text.includes('Уточнение требований') || text.includes('опросник') || text.includes('Option 1') || text.includes('Вариант 1')
   })
   if (hasRecentQuestion) {
     return false
   }
 
   const creationTriggers = [
+    'make', 'build', 'create', 'generate', 'develop', 'design',
+    '制作', '创建', '构建', '开发', '设计',
     'сделай', 'создай', 'напиши', 'разработай', 'придумай', 'реализуй',
-    'make', 'build', 'create', 'generate', 'develop',
   ]
   const startsWithCreation = creationTriggers.some((t) => p.toLowerCase().startsWith(t))
 
@@ -150,7 +151,7 @@ export function isBroadPromptRequiringQuestions(userPrompt = '', messages = [])
     return true
   }
 
-  const vagueNouns = ['приложение', 'игру', 'сервис', 'сайт', 'лендинг', 'калькулятор', 'виджет', 'дашборд', 'app', 'game', 'tool', 'website']
+  const vagueNouns = ['app', 'game', 'tool', 'website', 'dashboard', 'widget', 'service', 'landing', 'calculator', '应用', '游戏', '工具', '网站', '仪表盘', '服务', 'приложение', 'игру', 'сервис', 'сайт', 'лендинг', 'калькулятор', 'виджет', 'дашборд']
   if (vagueNouns.some((n) => p.toLowerCase().includes(n))) {
     if (wordCount <= 12) return true
   }
@@ -190,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')
 
@@ -223,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}]` : ''
@@ -290,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) {
@@ -396,11 +395,11 @@ export async function runMoAPipeline({
       qUsage = estimateTokenCost(primaryJudge, qFallbackUsage, prices)
     } catch (err) {
       console.warn('[dsh-moa] Questionnaire synthesis failed, proceeding with fallback questions:', err)
-      questionsContent = `### Уточнение требований по задаче: "${userPrompt}"\n\n` +
-        '1. **Формат решения**: однофайловый HTML/JS или многомодульный проект?\n' +
-        '2. **Стиль и визуальное оформление**: минимализм, темная тема или нейтральный интерфейс?\n' +
-        '3. **Функциональные приоритеты**: базовый MVP или расширенная реализация?\n\n' +
-        '*Ответьте кратко (например, "1, 2") или доверьтесь выбору по умолчанию.*'
+      questionsContent = `### Clarification of Requirements: "${userPrompt}"\n\n` +
+        '1. **Architecture & Scope**: Single-file deliverable or multi-module project structure?\n' +
+        '2. **Design & Style**: Minimalist, dark mode, or clean neutral theme?\n' +
+        '3. **Functional Priorities**: Core MVP or comprehensive extended implementation?\n\n' +
+        '*Reply with your preferences (e.g. "1, 2") or proceed with defaults.*'
     }
 
     await cleanMoaWorkspaces(cwd)
@@ -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.13",
+  "version": "0.2.15",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",