@goodandready/dsh-moa 0.2.42 → 0.2.43

package/lib/client.js

@@ -101,6 +101,8 @@ window.__ModuleLoader__.load({
       'proposers.add_btn': '+ Add Candidate Model',
       'proposers.temp_label': 'Candidates Temperature',
       'proposers.temp_hint': 'Recommended: 0.6 – 0.8 for creative, independent solution exploration.',
+      'proposers.temperature_gradient': 'Temperature Gradient Exploration (0.2 → 0.9 across candidates)',
+      'proposers.candidate_temp_tooltip': 'Candidate Temperature (leave empty for default/gradient)',
       'stats.title': '📈 MoA Analytics & Telemetry',
       'stats.desc': 'Session telemetry, historical runs, and model win-rate tracking.',
       'stats.total_runs': 'Total Runs',
@@ -277,6 +279,8 @@ window.__ModuleLoader__.load({
       'proposers.add_btn': '+ 添加候选模型',
       'proposers.temp_label': '候选模型采样温度 (Temperature)',
       'proposers.temp_hint': '推荐：0.6 – 0.8，鼓励创造性、发散性的独立探索。',
+      'proposers.temperature_gradient': '温度梯度探索（候选模型采样温度从 0.2 到 0.9 递增）',
+      'proposers.candidate_temp_tooltip': '候选模型采样温度（留空使用默认/梯度）',
       'stats.title': '📈 MoA 数据分析与遥测',
       'stats.desc': '会话遥测、历史运行追踪及模型胜率统计。',
       'stats.total_runs': '总运行次数',
@@ -1962,7 +1966,7 @@ window.__ModuleLoader__.load({
                 onChange: (e) => updateCurrentPreset((p) => ({ ...p, temperature_gradient_enabled: e.target.checked })),
                 style: { accentColor: 'var(--dsw-alias-state-brand-primary, var(--dsw-alias-label-primary))', cursor: 'pointer' },
               }),
-              'Temperature Gradient Exploration (0.2 → 0.9 across candidates)'
+              t('proposers.temperature_gradient') || 'Temperature Gradient Exploration (0.2 → 0.9 across candidates)'
             )
           ),
           React.createElement(
@@ -1990,7 +1994,7 @@ window.__ModuleLoader__.load({
                   min: '0',
                   max: '2',
                   placeholder: 'Temp',
-                  title: 'Candidate Temperature (leave empty for default/gradient)',
+                  title: t('proposers.candidate_temp_tooltip') || 'Candidate Temperature (leave empty for default/gradient)',
                   className: 'moa-input',
                   style: { width: 50, height: 32, fontSize: 12, padding: '0 4px', textAlign: 'center' },
                   value: (typeof ref.temperature === 'number' && ref.temperature >= 0) ? ref.temperature : '',
@@ -2612,13 +2616,14 @@ window.__ModuleLoader__.load({
       }
       render() {
         if (this.state.hasError) {
+          const t = typeof this.props?.t === 'function' ? this.props.t : (typeof makeT === 'function' ? makeT(en, null) : ((k) => k))
           return React.createElement(
             'div',
             {
               className: 'moa-alert-err',
               style: { margin: '12px 0', padding: '14px', borderRadius: '8px' },
             },
-            React.createElement('div', { style: { fontWeight: 600, marginBottom: '6px' } }, '⚠️ MoA UI Error:'),
+            React.createElement('div', { style: { fontWeight: 600, marginBottom: '6px' } }, t('error_boundary.title') || '⚠️ MoA UI Error:'),
             React.createElement('div', { style: { fontSize: '12px', wordBreak: 'break-all' } }, String(this.state.error?.message || this.state.error)),
             React.createElement(
               'button',
@@ -2628,7 +2633,7 @@ window.__ModuleLoader__.load({
                 style: { marginTop: '10px', fontSize: '12px', padding: '4px 10px' },
                 onClick: () => this.setState({ hasError: false, error: null }),
               },
-              'Retry'
+              t('error_boundary.retry') || 'Retry'
             )
           )
         }
@@ -2675,12 +2680,12 @@ window.__ModuleLoader__.load({
             'div',
             { className: 'moa-body' },
             state.status === 'loading'
-              ? React.createElement('div', { style: { padding: '16px 0', color: 'var(--dsw-alias-label-secondary)', fontSize: 13 } }, 'Loading MoA settings…')
+              ? React.createElement('div', { style: { padding: '16px 0', color: 'var(--dsw-alias-label-secondary)', fontSize: 13 } }, state.t('status.loading') || 'Loading MoA settings…')
               : state.status === 'unavailable'
                 ? React.createElement(
                     'div',
                     { style: { padding: '16px 0', display: 'flex', flexDirection: 'column', gap: 10 } },
-                    React.createElement('div', { className: 'moa-alert-err' }, 'MoA service temporarily unavailable'),
+                    React.createElement('div', { className: 'moa-alert-err' }, state.t('status.unavailable') || 'MoA service temporarily unavailable'),
                     React.createElement(
                       'button',
                       {
@@ -2689,7 +2694,7 @@ window.__ModuleLoader__.load({
                         style: { width: 'fit-content' },
                         onClick: state.reload,
                       },
-                      state.t('actions.retry')
+                      state.t('status.retry') || state.t('actions.retry')
                     )
                   )
                 : React.createElement(MoAEditor, state)
@@ -2738,7 +2743,7 @@ window.__ModuleLoader__.load({
                 locale: NS,
                 inject: () => ({ ctx }),
               },
-              (props) => React.createElement(MoAErrorBoundary, null, React.createElement(MoACard, props))
+              (props) => React.createElement(MoAErrorBoundary, props, React.createElement(MoACard, props))
             )
           } catch (err) {
             console.warn('[dsh-moa] Failed to register ' + slotName + ':', err)
@@ -2761,7 +2766,7 @@ window.__ModuleLoader__.load({
                 locale: NS,
                 inject: () => ({ ctx }),
               },
-              (props) => React.createElement(MoAErrorBoundary, null, React.createElement(MoACard, props))
+              (props) => React.createElement(MoAErrorBoundary, props, React.createElement(MoACard, props))
             )
           } catch (err) {
             console.warn('[dsh-moa] Failed to register plugins.item:', err)

package/lib/file-workspace.js

@@ -78,7 +78,17 @@ export function resolveCandidateFolder(baseDir, candidateTarget, options = {}) {
   const sub = /^\d+$/.test(sanitizedTarget) ? `candidate-${sanitizedTarget}` : (sanitizedTarget || 'candidate-1')
   const rawRunId = typeof options === 'string' ? options : options?.runId
   const safeRunId = rawRunId ? String(rawRunId).trim().replace(/[^a-zA-Z0-9_-]/g, '') : null
-  const moaRoot = path.join(baseDir, '.moa')
+  const moaPath = path.resolve(baseDir, '.moa')
+  try {
+    const lst = fsSync.lstatSync(moaPath)
+    if (lst.isSymbolicLink()) {
+      const realMoa = fsSync.realpathSync(moaPath), realBase = fsSync.realpathSync(path.resolve(baseDir))
+      if (realMoa !== realBase && !realMoa.startsWith(realBase + path.sep)) fsSync.unlinkSync(moaPath)
+    }
+  } catch (err) {
+    if (err?.code !== 'ENOENT') throw err
+  }
+  const moaRoot = assertPathContained(baseDir, '.moa')
   const runRoot = safeRunId ? assertPathContained(moaRoot, safeRunId) : moaRoot
   return { moaRoot, runRoot, safeRunId, sub, candidateDir: assertPathContained(runRoot, sub) }
 }
@@ -97,18 +107,16 @@ export function extractFileBlocks(text) {
     }
   }
 
-  const fenceRegex = /```[\w-]*\s+(?:file|path|filepath)=["']?([^\s"'\n\r]+)["']?[\r\n]+([\s\S]*?)```/gi
-  let match
-  while ((match = fenceRegex.exec(text)) !== null) addFile(match[1].trim(), match[2])
-
-  const commentRegex = /(?:\/\/|#|<!--)\s*(?:File|Path):\s*([^\s\n\r>]+)(?:\s*-->)?[\r\n]+```[\w-]*[\r\n]+([\s\S]*?)```/gi
-  while ((match = commentRegex.exec(text)) !== null) addFile(match[1].trim(), match[2])
-
-  const headerRegex = /#{1,4}\s+(?:File|Path):\s*([^\s\n\r]+)[\r\n]+```[\w-]*[\r\n]+([\s\S]*?)```/gi
-  while ((match = headerRegex.exec(text)) !== null) addFile(match[1].trim(), match[2])
-
-  const inlineRegex = /```[\w-]*[\r\n]+(?:\/\/|#|<!--)\s*(?:File|Path):\s*([^\s\n\r>]+)(?:\s*-->)?[\r\n]+([\s\S]*?)```/gi
-  while ((match = inlineRegex.exec(text)) !== null) addFile(match[1].trim(), match[2])
+  const patterns = [
+    /```[\w-]*\s+(?:file|path|filepath)=["']?([^\s"'\n\r]+)["']?[\r\n]+([\s\S]*?)```/gi,
+    /(?:\/\/|#|<!--)\s*(?:File|Path):\s*([^\s\n\r>]+)(?:\s*-->)?[\r\n]+```[\w-]*[\r\n]+([\s\S]*?)```/gi,
+    /#{1,4}\s+(?:File|Path):\s*([^\s\n\r]+)[\r\n]+```[\w-]*[\r\n]+([\s\S]*?)```/gi,
+    /```[\w-]*[\r\n]+(?:\/\/|#|<!--)\s*(?:File|Path):\s*([^\s\n\r>]+)(?:\s*-->)?[\r\n]+([\s\S]*?)```/gi,
+  ]
+  for (const regex of patterns) {
+    let match
+    while ((match = regex.exec(text)) !== null) addFile(match[1].trim(), match[2])
+  }
 
   if (files.length === 0) {
     const htmlBlockRegex = /```(?:html)?[\r\n]+([\s\S]*?)```/gi
@@ -211,15 +219,12 @@ export async function collectProjectContext(baseDir, maxCharBudget = 16000) {
  * Checks if a task prompt is an iterative refinement / modification.
  */
 export function isRefinementTask(userPrompt = '', projectFiles = null) {
-  if (Array.isArray(projectFiles) && projectFiles.length === 0) return false
+  if ((Array.isArray(projectFiles) && projectFiles.length === 0) || !userPrompt?.trim()) return false
   const p = userPrompt.toLowerCase().trim()
-  if (!p) return false
-
-  const freshPhrases = ['from scratch', 'new project', 'new app', 'create a new', 'build a new', 'generate a new', '从头开始', '新建项目', '创建项目', '新应用', '新建应用', 'с нуля', 'новый проект', 'новое приложение', 'создай проект', 'создай приложение', 'создай игру', 'создай сервис', 'сделай проект', 'сделай приложение', 'сделай игру']
-  if (freshPhrases.some((phrase) => p.includes(phrase))) return false
-
-  const modKeywords = ['add', 'change', 'update', 'fix', 'modify', 'refactor', 'improve', 'enhance', 'adjust', 'style', 'css', 'color', 'theme', 'bug', '添加', '修改', '更新', '修复', '重构', '改进', '调整', '样式', '颜色', '主题', 'добавь', 'измени', 'поменяй', 'исправь', 'обнови', 'переделай', 'доработай', 'удали', 'темн', 'светл', 'цвет', 'кнопк', 'баг']
-  return modKeywords.some((kw) => p.includes(kw))
+  const fresh = ['from scratch', 'new project', 'new app', 'create a new', 'build a new', 'generate a new', '从头开始', '新建项目', '创建项目', '新应用', '新建应用', 'с нуля', 'новый проект', 'новое приложение', 'создай проект', 'создай приложение', 'создай игру', 'создай сервис', 'сделай проект', 'сделай приложение', 'сделай игру']
+  if (fresh.some((phrase) => p.includes(phrase))) return false
+  const mod = ['add', 'change', 'update', 'fix', 'modify', 'refactor', 'improve', 'enhance', 'adjust', 'style', 'css', 'color', 'theme', 'bug', '添加', '修改', '更新', '修复', '重构', '改进', '调整', '样式', '颜色', '主题', 'добавь', 'измени', 'поменяй', 'исправь', 'обнови', 'переделай', 'доработай', 'удали', 'темн', 'светл', 'цвет', 'кнопк', 'баг']
+  return mod.some((kw) => p.includes(kw))
 }
 
 /**
@@ -344,6 +349,9 @@ async function doPromoteCandidateWorkspace(baseDir, winningIndex, options = { ke
       logger.warn(errMsg)
       throw new Error(errMsg)
     }
+    if (options.signal?.aborted) {
+      throw (options.signal.reason instanceof Error ? options.signal.reason : new Error('Turn aborted'))
+    }
 
     const promoted = []
     const baseReal = await fs.realpath(baseDir).catch(() => path.resolve(baseDir))
@@ -392,11 +400,9 @@ export async function cleanMoaWorkspaces(baseDir, options = {}) {
   const safeRunId = rawRunId ? String(rawRunId).trim().replace(/[^a-zA-Z0-9_-]/g, '') : null
   const moaRoot = path.join(baseDir, '.moa')
   if (safeRunId) {
-    const runRoot = path.join(moaRoot, safeRunId)
-    await bestEffort('cleanMoaWorkspaces runId', () => fs.rm(runRoot, { recursive: true, force: true }))
+    await bestEffort('cleanMoaWorkspaces runId', () => fs.rm(path.join(moaRoot, safeRunId), { recursive: true, force: true }))
     await bestEffort('clean empty moaRoot', async () => {
-      const remaining = await fs.readdir(moaRoot)
-      if (remaining.length === 0) await fs.rmdir(moaRoot)
+      if ((await fs.readdir(moaRoot)).length === 0) await fs.rmdir(moaRoot)
     })
   } else {
     await bestEffort('cleanMoaWorkspaces', () => fs.rm(moaRoot, { recursive: true, force: true }))
@@ -563,33 +569,24 @@ export function computeLineDiff(oldText = '', newText = '') {
   const subN = subOld.length, subM = subNew.length
   const middleItems = []
 
-  if (subN === 0) {
-    for (let j = 0; j < subM; j++) middleItems.push({ type: 'added', line: subNew[j], newNum: start + j + 1 })
-  } else if (subM === 0) {
-    for (let i = 0; i < subN; i++) middleItems.push({ type: 'removed', line: subOld[i], oldNum: start + i + 1 })
-  } else if (subN > 2000 || subM > 2000) {
+  if (subN === 0) for (let j = 0; j < subM; j++) middleItems.push({ type: 'added', line: subNew[j], newNum: start + j + 1 })
+  else if (subM === 0) for (let i = 0; i < subN; i++) middleItems.push({ type: 'removed', line: subOld[i], oldNum: start + i + 1 })
+  else if (subN > 2000 || subM > 2000) {
     for (let i = 0; i < subN; i++) middleItems.push({ type: 'removed', line: subOld[i], oldNum: start + i + 1 })
     for (let j = 0; j < subM; j++) middleItems.push({ type: 'added', line: subNew[j], newNum: start + j + 1 })
   } else {
     const dp = Array.from({ length: subN + 1 }, () => new Uint16Array(subM + 1))
     for (let i = 0; i < subN; i++) {
-      for (let j = 0; j < subM; j++) {
-        dp[i + 1][j + 1] = subOld[i] === subNew[j] ? dp[i][j] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1])
-      }
+      for (let j = 0; j < subM; j++) dp[i + 1][j + 1] = subOld[i] === subNew[j] ? dp[i][j] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1])
     }
-
-    let i = subN, j = subM
-    const stack = []
+    let i = subN, j = subM; const stack = []
     while (i > 0 || j > 0) {
       if (i > 0 && j > 0 && subOld[i - 1] === subNew[j - 1]) {
-        stack.push({ type: 'same', line: subOld[i - 1], oldNum: start + i, newNum: start + j })
-        i--; j--
+        stack.push({ type: 'same', line: subOld[--i], oldNum: start + i + 1, newNum: start + j }); j--
       } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
-        stack.push({ type: 'added', line: subNew[j - 1], newNum: start + j })
-        j--
-      } else if (i > 0 && (j === 0 || dp[i][j - 1] < dp[i - 1][j])) {
-        stack.push({ type: 'removed', line: subOld[i - 1], oldNum: start + i })
-        i--
+        stack.push({ type: 'added', line: subNew[--j], newNum: start + j + 1 })
+      } else if (i > 0) {
+        stack.push({ type: 'removed', line: subOld[--i], oldNum: start + i + 1 })
       }
     }
     middleItems.push(...stack.reverse())

package/lib/history.js

@@ -358,7 +358,13 @@ export function getMoaHistory(limit = 20, offset = 0, filePath = getDefaultHisto
       })
       .filter(Boolean)
 
-    let total = _historyCache?.totalCount
+    let total = (_historyCache &&
+      _historyCache.filePath === filePath &&
+      _historyCache.mtimeMs === stat.mtimeMs &&
+      _historyCache.size === stat.size &&
+      typeof _historyCache.totalCount === 'number')
+        ? _historyCache.totalCount
+        : undefined
     if (typeof total !== 'number') {
       total = tailLines.length < needed ? tailLines.length : countFileLinesSync(filePath, stat)
     }

package/lib/index.js

@@ -1,3 +1,4 @@
+import crypto from 'node:crypto'
 import path from 'node:path'
 import { setLogger, logger } from './logger.js'
 import { refreshCatalogInBackground } from './pricing.js'
@@ -19,6 +20,7 @@ import { resolvePresetForPrompt } from './moa-router.js'
 import { createLiveCanvasClient } from './live-canvas.js'
 import { registerPluginUpdater } from './updater.js'
 import { bestEffort } from './best-effort.js'
+import { getMoaHistory } from './history.js'
 
 export const name = '@goodandready/dsh-moa'
 export { collectProjectContext, formatProjectContext } from './file-workspace.js'
@@ -39,12 +41,24 @@ export function apply(ctx, config) {
   refreshCatalogInBackground()
 
   let localOverrides = null
+  let baseAtOverride = {}
   const getSourceConfig = () => {
     let liveCandidate = ctx.fiber?.config
     if (!liveCandidate && ('config' in ctx)) {
       bestEffort('ctx.config probe', () => { liveCandidate = ctx.config }, ctx.logger)
     }
     const liveSource = plainConfig(liveCandidate ?? config ?? {})
+    if (localOverrides) {
+      for (const key of Object.keys(localOverrides)) {
+        if (baseAtOverride[key] !== undefined && JSON.stringify(liveSource[key]) !== baseAtOverride[key]) {
+          delete localOverrides[key]
+          delete baseAtOverride[key]
+        }
+      }
+      if (Object.keys(localOverrides).length === 0) {
+        localOverrides = null
+      }
+    }
     return localOverrides ? { ...liveSource, ...localOverrides } : liveSource
   }
   const live = () => {
@@ -86,6 +100,15 @@ export function apply(ctx, config) {
     } else if (settingsService && typeof settingsService.update === 'function') {
       await settingsService.update(NS, plain)
     }
+    let liveCandidate = ctx.fiber?.config
+    if (!liveCandidate && ('config' in ctx)) {
+      bestEffort('ctx.config probe', () => { liveCandidate = ctx.config }, ctx.logger)
+    }
+    const currentLive = plainConfig(liveCandidate ?? config ?? {})
+    baseAtOverride = baseAtOverride || {}
+    for (const key of Object.keys(plain)) {
+      baseAtOverride[key] = JSON.stringify(currentLive[key])
+    }
     localOverrides = { ...(localOverrides || {}), ...plain }
     return live()
   }
@@ -176,10 +199,15 @@ export function apply(ctx, config) {
           const effectiveDefault = cfg.default_preset || 'default'
           const parsed = parseMoACommand(userText, cfg.presets || [], effectiveDefault) || { prompt: userText, presetName: effectiveDefault, isExplicit: false }
           if (parsed.isPromote) {
+            let promoteRunId = parsed.runId
+            if (!promoteRunId) {
+              const latestRun = getMoaHistory(1, 0)?.runs?.[0]
+              if (latestRun?.id) promoteRunId = latestRun.id
+            }
             const sessCwd = event.cwd || event.session?.cwd || (event.session?.path ? path.dirname(event.session.path) : undefined) || process.cwd()
             const turnContext = {
               isPromoteTurn: true,
-              runId: parsed.runId,
+              runId: promoteRunId,
               candidateIndex: parsed.candidateIndex,
               cwd: sessCwd,
               webServerPort: ctx.webServer?.port,
@@ -192,11 +220,14 @@ export function apply(ctx, config) {
           const isExplicitPreset = Boolean(parsed.isExplicit || userText.includes('--preset') || userText.includes('-p '))
           if (!isExplicitPreset && (cfg.smart_routing_enabled || cfg.presets?.some((p) => p.smart_routing_enabled))) {
             try {
+              const activePreset = (cfg.presets || []).find((p) => p.name === (parsed.presetName || effectiveDefault)) || cfg.presets?.[0]
+              const routingModel = (activePreset?.smart_routing_model?.model && activePreset.smart_routing_model)
+                || (cfg.smart_routing_model?.model && cfg.smart_routing_model) || activePreset?.smart_routing_model || cfg.smart_routing_model
               const routed = await resolvePresetForPrompt({
                 prompt: parsed.prompt || userText,
                 presets: cfg.presets || [],
                 defaultPreset: parsed.presetName || effectiveDefault,
-                routingModel: cfg.smart_routing_model,
+                routingModel,
                 callLlm,
                 enabled: true,
               })
@@ -216,8 +247,10 @@ export function apply(ctx, config) {
           const aggProvider = targetPreset?.aggregator?.provider || ''
           const aggModel = targetPreset?.aggregator?.model || ''
           const sessCwd = event.cwd || event.session?.cwd || (event.session?.path ? path.dirname(event.session.path) : undefined) || process.cwd()
+          const runId = crypto.randomUUID()
 
           const turnContext = {
+            runId,
             targetPreset,
             userPrompt: parsed.prompt || userText,
             messages: messages.slice(0, -1),

package/lib/moa-budget.js

@@ -74,25 +74,29 @@ export function applyBudgetGuardrails({
   // Base candidate cost per slot (Round 1)
   const { totalEstimatedUsd, slotEstimates } = estimateCandidateRunCost(references, prices, promptTokens, expectedOutputTokens)
 
-  // Estimate fixed cost for downstream phases (Aggregator / Judge panel)
-  let downstreamUsd = 0
-  if (aggregator?.provider && aggregator?.model) {
-    const aggInput = promptTokens + expectedOutputTokens * references.length
-    const aggCost = estimateTokenCost(aggregator, { inputTokens: aggInput, outputTokens: expectedOutputTokens }, prices)
-    downstreamUsd += aggCost?.costUsd || 0
-  }
-  if (Array.isArray(judgeModels) && judgeModels.length > 0) {
-    for (const jm of judgeModels) {
-      if (jm?.provider && jm?.model) {
-        const jInput = promptTokens + expectedOutputTokens * references.length
-        const jCost = estimateTokenCost(jm, { inputTokens: jInput, outputTokens: expectedOutputTokens }, prices)
-        downstreamUsd += jCost?.costUsd || 0
+  // Estimate cost for downstream phases (Aggregator / Judge panel)
+  function calcDownstreamUsd(numCandidates) {
+    let downstream = 0
+    if (aggregator?.provider && aggregator?.model) {
+      const aggInput = promptTokens + expectedOutputTokens * numCandidates
+      const aggCost = estimateTokenCost(aggregator, { inputTokens: aggInput, outputTokens: expectedOutputTokens }, prices)
+      downstream += aggCost?.costUsd || 0
+    }
+    if (Array.isArray(judgeModels) && judgeModels.length > 0) {
+      for (const jm of judgeModels) {
+        if (jm?.provider && jm?.model) {
+          const jInput = promptTokens + expectedOutputTokens * numCandidates
+          const jCost = estimateTokenCost(jm, { inputTokens: jInput, outputTokens: expectedOutputTokens }, prices)
+          downstream += jCost?.costUsd || 0
+        }
       }
     }
+    return downstream
   }
 
   // Multiplier if peer critique (Round 2) is enabled: each candidate runs another turn with input from all peers
   const roundMultiplier = peerCritiqueEnabled ? 2 : 1
+  const downstreamUsd = calcDownstreamUsd(references.length)
   const fullEstimatedUsd = Number(((totalEstimatedUsd * roundMultiplier) + downstreamUsd).toFixed(6))
 
   if (fullEstimatedUsd <= maxBudgetUsd) {
@@ -116,38 +120,43 @@ export function applyBudgetGuardrails({
   }
 
   // Action is 'trim': Sort by estimated cost ascending (cheapest first)
+  // Factor downstream synthesis cost into candidate selection (#158)
   const sorted = [...slotEstimates].sort((a, b) => a.costUsd - b.costUsd)
   const kept = []
-  let cumulative = 0
+  let cumulativeCandidateCost = 0
 
   for (const item of sorted) {
     const candidateCost = item.costUsd * roundMultiplier
-    if (cumulative + candidateCost <= maxBudgetUsd) {
+    const nextDownstream = calcDownstreamUsd(kept.length + 1)
+    if (cumulativeCandidateCost + candidateCost + nextDownstream <= maxBudgetUsd) {
       kept.push(item.slot)
-      cumulative += candidateCost
+      cumulativeCandidateCost += candidateCost
     }
   }
 
   if (kept.length === 0) {
+    const minCandidateCost = (sorted[0]?.costUsd || 0) * roundMultiplier
+    const minTotal = minCandidateCost + calcDownstreamUsd(1)
     return {
       allowed: false,
       references: [],
       action: 'trim',
       originalCount: references.length,
       trimmedCount: 0,
-      estimatedCostUsd: Number((sorted[0]?.costUsd * roundMultiplier || 0).toFixed(6)),
+      estimatedCostUsd: Number(minTotal.toFixed(6)),
       maxBudgetUsd,
-      reason: `Cannot fit any candidate model within budget ($${maxBudgetUsd.toFixed(4)}). Cheapest candidate requires $${((sorted[0]?.costUsd || 0) * roundMultiplier).toFixed(4)}.`,
+      reason: `Cannot fit any candidate model within budget ($${maxBudgetUsd.toFixed(4)}). Cheapest candidate requires $${minTotal.toFixed(4)}.`,
     }
   }
 
+  const finalEstimatedUsd = Number((cumulativeCandidateCost + calcDownstreamUsd(kept.length)).toFixed(6))
   return {
     allowed: true,
     references: kept,
     action: 'trim',
     originalCount: references.length,
     trimmedCount: kept.length,
-    estimatedCostUsd: Number(cumulative.toFixed(6)),
+    estimatedCostUsd: finalEstimatedUsd,
     maxBudgetUsd,
     reason: `Trimmed candidate pool from ${references.length} to ${kept.length} models to stay within budget ($${maxBudgetUsd.toFixed(4)}).`,
   }

package/lib/moa-candidates.js

@@ -122,9 +122,11 @@ export async function runReferencesParallel(references, messages, options = {},
             })
             reject(new Error(`Timeout after ${Math.round(timeoutMs / 1000)}s`))
           }, timeoutMs)
+          candidateTimer?.unref?.()
         })
 
         const res = await Promise.race([callPromise, timeoutPromise])
+        if (candidateTimer) { clearTimeout(candidateTimer); candidateTimer = null }
         const text = typeof res === 'string' ? res : (res?.content || res?.text || '')
 
         const fallbackUsage = (typeof res === 'object' && res?.usage) ? res.usage : {
@@ -275,6 +277,7 @@ export async function runReferencesParallel(references, messages, options = {},
           }
         }
       } finally {
+        if (candidateTimer) clearTimeout(candidateTimer)
         notifyFinished()
       }
     }

package/lib/moa-multi-judge.js

@@ -371,7 +371,8 @@ CONSENSUS_REASONING: [one concise sentence explaining your pick]
 
   const winningCand = activeCandidates.find((c) => c.index === winner) || activeCandidates[0]
   const winnerVotes = votes[winner] || 0
-  const consensusReport = `Multi-judge consensus (${strategy}): Candidate ${winner} (${winningCand.label}) won with ${winnerVotes}/${validResults.length} votes.`
+  const winnerLabel = blind ? '' : ` (${winningCand.label})`
+  const consensusReport = `Multi-judge consensus (${strategy}): Candidate ${winner}${winnerLabel} won with ${winnerVotes}/${validResults.length} votes.`
 
   if (typeof onProgress === 'function') {
     onProgress(`⚖️ *${consensusReport}*\n`)

package/lib/moa-prompts.js

@@ -302,6 +302,10 @@ export function buildSynthesisPrompt(userPrompt, referenceOutputs = [], judgeCri
   }
 
   const isBlind = Boolean(options.blindEvaluation)
+  let consensusReportText = options.consensusReport
+  if (isBlind && consensusReportText) {
+    consensusReportText = consensusReportText.replace(/\s*\([^)]+\)/g, '')
+  }
 
   const joined = referenceOutputs
     .map((r, i) => {
@@ -344,7 +348,7 @@ ${LANGUAGE_MIRRORING_DIRECTIVE}
 ${referenceOutputs.some((r) => r.testResult) ? `\n${TEST_GATE_DIRECTIVE}\n` : ''}
 ${referenceOutputs.some((r) => r.syntaxWarning) ? `\n${SYNTAX_CORRECTION_DIRECTIVE}\n` : ''}
 ${options.priorTurnBaseline ? `\n### 🔄 Prior Turn Context Baseline:\n${options.priorTurnBaseline}\n` : ''}
-${options.consensusReport ? `\n### ⚖️ Multi-Judge Consensus Advisory:\n${options.consensusReport}\n` : ''}
+${consensusReportText ? `\n### ⚖️ Multi-Judge Consensus Advisory:\n${consensusReportText}\n` : ''}
 ${options.compositeMergeDirective ? `\n${options.compositeMergeDirective}\n` : ''}
 Instructions:
 Your response MUST be structured into three clear parts:

package/lib/moa-runner.js

@@ -38,7 +38,8 @@ export async function runMoAPipeline({
   webServerPort = null, timeMachineEngine = null, timeMachineUrl = null,
   force = isTestEnvironment() ? true : false, checkpoint = true, checkpointFn = null, runId: customRunId = null,
 }) {
-  const promoteOpts = { webServerPort, timeMachineEngine, timeMachineUrl, force: Boolean(force), checkpoint, checkpointFn }
+  const runId = (customRunId && String(customRunId).trim()) || crypto.randomUUID()
+  const promoteOpts = { webServerPort, timeMachineEngine, timeMachineUrl, force: Boolean(force), checkpoint, checkpointFn, signal }
   if (signal?.aborted) return { error: new Error('Turn aborted') }
   const startTime = Date.now()
   // 1. Resolve configurations
@@ -58,7 +59,7 @@ export async function runMoAPipeline({
   const candidateRetries = 1, refTimeoutSec = typeof preset?.reference_timeout_sec === 'number' ? preset.reference_timeout_sec : 60
   const aggTimeoutSec = typeof preset?.aggregator_timeout_sec === 'number' ? preset.aggregator_timeout_sec : 180
   const isBlindEvaluation = Boolean(preset?.blind_evaluation), isPeerCritiqueEnabled = Boolean(preset?.peer_critique_enabled)
-  const allowCandidateOverride = Boolean(preset?.allow_candidate_override), runId = customRunId || null
+  const allowCandidateOverride = Boolean(preset?.allow_candidate_override)
   // Feature 6: Budget Guardrail check
   const budgetCheck = applyBudgetGuardrails({
     references: referenceModels,
@@ -275,12 +276,18 @@ export async function runMoAPipeline({
       return { error: new Error('Turn aborted') }
     }
     const single = successfulRefs[0]
-    let promotedFiles = []
+    let promotedFiles = [], promoteErr = null
     if (single.files?.length > 0) {
-      promotedFiles = await promoteCandidateWorkspace(cwd, single.index, { ...promoteOpts, runId })
-    } else {
+      try {
+        promotedFiles = await promoteCandidateWorkspace(cwd, single.index, { ...promoteOpts, runId, keepMoa: allowCandidateOverride })
+      } catch (e) { promoteErr = e }
+    } else if (!allowCandidateOverride) {
       await cleanMoaWorkspaces(cwd, { runId })
     }
+    if (signal?.aborted || promoteErr?.message?.includes('aborted') || promoteErr?.name === 'AbortError') {
+      if (!allowCandidateOverride) await cleanMoaWorkspaces(cwd, { runId })
+      return { error: new Error('Turn aborted') }
+    }
 
     const livePreview = await createPromotedPreview(liveCanvas, cwd, promotedFiles, referenceOutputs, { winningIndex: single.index })
     const totalTokens = single.usage?.totalTokens || 0
@@ -289,44 +296,27 @@ export async function runMoAPipeline({
 
     try {
       await recordMoaRunAsync({
-        cwd,
-        prompt: userPrompt,
-        preset: preset?.name || 'default',
-        isRefinement,
-        isFastMode: true,
-        candidates: candidatesForHistory(referenceOutputs),
-        aggregator: null,
-        winnerIndex: single.index,
-        winnerModel: single.label,
-        promotedFiles,
-        totalTokens,
-        totalCostUsd,
-        durationMs,
+        id: runId, cwd, prompt: userPrompt, preset: preset?.name || 'default',
+        isRefinement, isFastMode: true, candidates: candidatesForHistory(referenceOutputs),
+        aggregator: null, winnerIndex: single.index, winnerModel: single.label,
+        promotedFiles, totalTokens, totalCostUsd, durationMs,
       }, historyFilePath || undefined)
     } catch (histErr) {
       logger.warn('[dsh-moa] Failed to record fast synthesis run in history:', histErr?.message || histErr)
     }
 
     return {
-      kind: 'synthesis',
-      content: single.text,
-      aggregator: 'Fast Mode (Direct)',
-      references: referenceOutputs,
-      presetName: preset?.name || 'default',
-      isRefinement,
-      isFastMode: true,
-      winningIndex: single.index,
-      winnerModel: single.label,
-      promotedFiles,
+      kind: 'synthesis', content: single.text, aggregator: 'Fast Mode (Direct)',
+      references: referenceOutputs, presetName: preset?.name || 'default',
+      isRefinement, isFastMode: true, winningIndex: single.index,
+      winnerModel: single.label, promotedFiles, runId,
       ...(livePreview ? { liveCanvas: livePreview } : {}),
       usage: {
-        totalTokens,
-        totalCostUsd,
+        totalTokens, totalCostUsd,
         candidates: referenceOutputs.map((r) => ({ label: r.label, usage: r.usage, costUsd: r.costUsd })),
         aggregator: { inputTokens: 0, outputTokens: 0, totalTokens: 0, costUsd: 0 },
       },
-      skippedFiles: collectedCtx?.skippedFiles || 0,
-      skippedList: collectedCtx?.skippedList || [],
+      skippedFiles: collectedCtx?.skippedFiles || 0, skippedList: collectedCtx?.skippedList || [],
       durationMs,
     }
   }
@@ -502,16 +492,26 @@ export async function runMoAPipeline({
   let promotedFiles = []
 
   const keepWorkspaces = allowCandidateOverride
-  if (synthesizedFiles.length > 0) {
-    await writeCandidateWorkspace(cwd, 'curator-synthesis', synthesizedFiles, { runId })
-    promotedFiles = await promoteCandidateWorkspace(cwd, 'curator-synthesis', { ...promoteOpts, runId, keepMoa: keepWorkspaces })
-  } else if (referenceOutputs[winningIndex - 1]?.files?.length > 0) {
-    promotedFiles = await promoteCandidateWorkspace(cwd, winningIndex, { ...promoteOpts, runId, keepMoa: keepWorkspaces })
-  } else if (successfulRefs[0]?.files?.length > 0) {
-    const fallbackIdx = successfulRefs[0].index
-    promotedFiles = await promoteCandidateWorkspace(cwd, fallbackIdx, { ...promoteOpts, runId, keepMoa: keepWorkspaces })
-  } else if (!keepWorkspaces) {
-    await cleanMoaWorkspaces(cwd, { runId })
+  if (signal?.aborted) {
+    if (!keepWorkspaces) await cleanMoaWorkspaces(cwd, { runId })
+    return { error: new Error('Turn aborted') }
+  }
+  try {
+    if (synthesizedFiles.length > 0) {
+      await writeCandidateWorkspace(cwd, 'curator-synthesis', synthesizedFiles, { runId })
+      promotedFiles = await promoteCandidateWorkspace(cwd, 'curator-synthesis', { ...promoteOpts, runId, keepMoa: keepWorkspaces })
+    } else if (referenceOutputs[winningIndex - 1]?.files?.length > 0) {
+      promotedFiles = await promoteCandidateWorkspace(cwd, winningIndex, { ...promoteOpts, runId, keepMoa: keepWorkspaces })
+    } else if (successfulRefs[0]?.files?.length > 0) {
+      const fallbackIdx = successfulRefs[0].index
+      promotedFiles = await promoteCandidateWorkspace(cwd, fallbackIdx, { ...promoteOpts, runId, keepMoa: keepWorkspaces })
+    } else if (!keepWorkspaces) {
+      await cleanMoaWorkspaces(cwd, { runId })
+    }
+  } catch (promoteErr) {
+    if (!keepWorkspaces) await cleanMoaWorkspaces(cwd, { runId })
+    if (signal?.aborted || promoteErr?.message === 'Turn aborted') return { error: new Error('Turn aborted') }
+    throw promoteErr
   }
 
   const livePreview = await createPromotedPreview(liveCanvas, cwd, promotedFiles, referenceOutputs, { winningIndex, synthesizedFiles })
@@ -582,8 +582,7 @@ export async function runMoAPipeline({
     consensus: multiJudgeResult,
     ...(livePreview ? { liveCanvas: livePreview } : {}),
     usage: usageSummary,
-    skippedFiles: collectedCtx?.skippedFiles || 0,
-    skippedList: collectedCtx?.skippedList || [],
+    skippedFiles: collectedCtx?.skippedFiles || 0, skippedList: collectedCtx?.skippedList || [],
     durationMs,
   }
 }

package/lib/moa-stream.js

@@ -4,7 +4,7 @@ import crypto from 'node:crypto'
  */
 
 import { cleanMoaWorkspaces, promoteCandidateWorkspace } from './file-workspace.js'
-import { isTestEnvironment } from './history.js'
+import { isTestEnvironment, getMoaHistory } from './history.js'
 import { formatMoAResponse } from './moa-parser.js'
 import { runMoAPipeline } from './moa-runner.js'
 
@@ -57,6 +57,7 @@ export async function* streamMoATurn({ targetPreset, userPrompt, messages, callL
       timeMachineEngine,
       force,
       signal: combinedSignal,
+      runId,
     })
       .catch((err) => ({ error: err }))
       .finally(() => {
@@ -152,10 +153,11 @@ export async function* streamPromoteTurn({ runId, candidateIndex, cwd, webServer
   }
 
   try {
-    yield { type: 'text-delta', index: 0, text: `🔄 *Promoting candidate ${candidateIndex}${runId ? ` for run \`${runId}\`` : ''}...*\n\n` }
+    const effectiveRunId = runId || getMoaHistory(1, 0).runs[0]?.id || null
+    yield { type: 'text-delta', index: 0, text: `🔄 *Promoting candidate ${candidateIndex}${effectiveRunId ? ` for run \`${effectiveRunId}\`` : ''}...*\n\n` }
 
     const promotedFiles = await promoteCandidateWorkspace(cwd, candidateIndex, {
-      runId,
+      runId: effectiveRunId,
       keepMoa: true,
       port: webServerPort,
       timeMachineEngine,
@@ -163,7 +165,7 @@ export async function* streamPromoteTurn({ runId, candidateIndex, cwd, webServer
     })
 
     if (!promotedFiles || promotedFiles.length === 0) {
-      const noFilesText = `⚠️ **MoA Promote Notice**: No candidate files found for candidate ${candidateIndex}${runId ? ` in run \`${runId}\`` : ''}. Workspace may have expired or run does not exist.`
+      const noFilesText = `⚠️ **MoA Promote Notice**: No candidate files found for candidate ${candidateIndex}${effectiveRunId ? ` in run \`${effectiveRunId}\`` : ''}. Workspace may have expired or run does not exist.`
       yield { type: 'text-delta', index: 0, text: noFilesText }
       yield { type: 'block-end', index: 0, block: { type: 'text', text: noFilesText } }
       yield { type: 'finish', reason: { kind: 'stop' } }

package/lib/moa-test-gate.js

@@ -115,12 +115,23 @@ export async function runCandidateTestGate({
       stderr = customRes?.stderr || ''
     } else {
       const nodePath = path.join(cwd, 'node_modules')
+      const allowedReads = [
+        executionDir,
+        cwd,
+        ...(candidateDir && candidateDir !== executionDir ? [candidateDir] : []),
+        ...(process.platform === 'win32'
+          ? [process.env.SYSTEMROOT || 'C:\\Windows', path.dirname(process.execPath)]
+          : ['/usr', '/lib', '/lib64', '/etc', path.resolve(path.dirname(process.execPath), '..'), process.env.HOME ? path.join(process.env.HOME, '.npmrc') : null]),
+      ].filter(Boolean)
+      const permOpts = `--permission ${allowedReads.map((p) => `--allow-fs-read=${p}`).join(' ')} --allow-fs-write=${executionDir} --allow-child-process`
+
       const env = getScrubbedEnv({
         MOA_CANDIDATE_INDEX: String(candidateIndex),
         MOA_CANDIDATE_DIR: candidateDir,
         MOA_BASE_DIR: cwd,
         ...(runId ? { MOA_RUN_ID: String(runId) } : {}),
         NODE_PATH: process.env.NODE_PATH ? `${nodePath}:${process.env.NODE_PATH}` : nodePath,
+        NODE_OPTIONS: process.env.NODE_OPTIONS ? `${process.env.NODE_OPTIONS} ${permOpts}` : permOpts,
       })
 
       const runPromise = new Promise((resolve) => {

package/lib/routes.js

@@ -356,9 +356,11 @@ ctx.effect(() => {
         }
         try {
           const u = new URL(req.url, 'http://localhost')
-          const runId = u.searchParams.get('runId') || undefined
+          const rawRunId = u.searchParams.get('runId')
+          const latestRun = (!rawRunId || rawRunId === 'latest' || rawRunId === 'active') ? getMoaHistory(1, 0).runs[0] : null
+          const runId = (rawRunId && rawRunId !== 'latest' && rawRunId !== 'active') ? rawRunId : latestRun?.id
           const run = runId ? getMoaRunById(runId) : null
-          const cwd = run?.cwd || u.searchParams.get('cwd') || process.cwd()
+          const cwd = run?.cwd || latestRun?.cwd || u.searchParams.get('cwd') || process.cwd()
           const sanitizeTarget = (val, def) => {
             const clean = String(val || '').trim().replace(/[^a-zA-Z0-9_-]/g, '')
             return clean || def
@@ -511,11 +513,14 @@ ctx.effect(() => {
           const raw = await readBody(req)
           const body = JSON.parse(raw || '{}')
           const prompt = body?.prompt || ''
+          const activePreset = (cfg.presets || []).find((p) => p.name === (cfg.default_preset || 'default')) || cfg.presets?.[0]
+          const routingModel = (activePreset?.smart_routing_model?.model && activePreset.smart_routing_model)
+            || (cfg.smart_routing_model?.model && cfg.smart_routing_model) || activePreset?.smart_routing_model || cfg.smart_routing_model
           const result = await resolvePresetForPrompt({
             prompt,
             presets: cfg.presets || [],
             defaultPreset: cfg.default_preset || 'default',
-            routingModel: cfg.smart_routing_model,
+            routingModel,
             callLlm,
             enabled: cfg.enabled !== false,
           })
@@ -575,6 +580,7 @@ ctx.effect(() => {
             timeMachineEngine: timeMachineEngine || ctx.reflect?.get?.('timeMachineEngine', false),
             timeMachineUrl: payload.timeMachineUrl, force: payload.force,
             checkpoint: payload.checkpoint, checkpointFn: payload.checkpointFn,
+            runId: payload.runId,
           })
 
           if (result?.skippedFiles > 0) {

package/package.json

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