@goodandready/dsh-moa 0.2.31 → 0.2.33

package/lib/client.js

@@ -422,20 +422,19 @@ window.__ModuleLoader__.load({
     }
 
     const PROVIDER_TITLES = {
-      codex: 'ChatGPT Codex',
+      deepseek: 'DeepSeek',
+      openai: 'OpenAI',
+      anthropic: 'Anthropic Claude',
       claude: 'Claude (Anthropic)',
-      grok: 'Grok (xAI)',
-      antigravity: 'Antigravity (Google)',
+      google: 'Google Gemini',
       gemini: 'Google Gemini',
-      commandcode: 'CommandCode Provider',
-      'opencode-go': 'OpenCode-Go',
-      'qwen-token-plan': 'Qwen (Token Plan)',
       groq: 'Groq Cloud',
-      zai: 'Zhipu GLM',
       ollama: 'Ollama (Local / Cloud)',
-      'kimi-coding': 'Kimi Coding',
+      openrouter: 'OpenRouter',
+      qwen: 'Qwen',
+      zai: 'Zhipu GLM',
       minimax: 'MiniMax',
-      'xiaomi-token-plan-sgp': 'Xiaomi Token Plan',
+      mistral: 'Mistral AI',
       'deepseek-official': 'DeepSeek Official',
     }
 
@@ -850,7 +849,7 @@ window.__ModuleLoader__.load({
       const currentPreset = presets.find((p) => p.name === selectedPresetName) || presets[0] || {
         name: 'default',
         reference_models: [],
-        aggregator: { provider: 'codex', model: 'gpt-5.6-sol' },
+        aggregator: { provider: (availableModels[0] && availableModels[0].provider) || '', model: (availableModels[0] && availableModels[0].model) || '' },
         aggregator_temperature: 0.4,
         reference_temperature: 0.6,
         judge_criteria: '',
@@ -902,8 +901,8 @@ window.__ModuleLoader__.load({
           } else {
             while (refs.length < targetCount) {
               const fallback = availableModels[refs.length % (availableModels.length || 1)] || {
-                provider: 'opencode-go',
-                model: 'deepseek-v4-flash',
+                provider: '',
+                model: '',
               }
               refs.push({ provider: fallback.provider, model: fallback.model })
             }
@@ -924,8 +923,8 @@ window.__ModuleLoader__.load({
         updateCurrentPreset((p) => {
           const refs = [...(p.reference_models || [])]
           const fallback = availableModels[refs.length % (availableModels.length || 1)] || {
-            provider: 'opencode-go',
-            model: 'deepseek-v4-flash',
+            provider: '',
+            model: '',
           }
           refs.push({ provider: fallback.provider, model: fallback.model, role_persona: 'general' })
           return { ...p, reference_models: refs }
@@ -945,13 +944,18 @@ window.__ModuleLoader__.load({
           name,
           enabled: true,
           ask_clarifying_questions: true,
-          reference_models: currentPreset?.reference_models?.length ? structuredClone(currentPreset.reference_models) : [
-            { provider: 'opencode-go', model: 'deepseek-v4-flash', role_persona: 'general' },
-            { provider: 'codex', model: 'gpt-5.6-sol', role_persona: 'general' },
-          ],
+          reference_models: currentPreset?.reference_models?.length ? structuredClone(currentPreset.reference_models) : (
+            availableModels.length >= 2 ? [
+              { provider: availableModels[0].provider, model: availableModels[0].model, role_persona: 'general' },
+              { provider: availableModels[1].provider, model: availableModels[1].model, role_persona: 'general' },
+            ] : [
+              { provider: '', model: '', role_persona: 'general' },
+              { provider: '', model: '', role_persona: 'general' },
+            ]
+          ),
           aggregator: currentPreset?.aggregator?.provider ? structuredClone(currentPreset.aggregator) : {
-            provider: 'codex',
-            model: 'gpt-5.6-sol',
+            provider: (availableModels[0] && availableModels[0].provider) || '',
+            model: (availableModels[0] && availableModels[0].model) || '',
           },
           reference_temperature: 0.6,
           aggregator_temperature: 0.4,
@@ -1513,15 +1517,16 @@ window.__ModuleLoader__.load({
                       'div',
                       { style: { flex: 1 } },
                       React.createElement(SearchableModelPicker, {
-                        value: fb,
-                        onChange: (val) => {
+                        provider: (fb && fb.provider) || '',
+                        model: (fb && fb.model) || '',
+                        onChange: (prov, mod) => {
                           updateCurrentPreset((p) => {
                             const list = [...(p.aggregator_fallbacks || [])]
-                            list[fbIdx] = val
+                            list[fbIdx] = { provider: prov, model: mod }
                             return { ...p, aggregator_fallbacks: list }
                           })
                         },
-                        allModels,
+                        availableModels,
                         t,
                       })
                     ),
@@ -1553,7 +1558,7 @@ window.__ModuleLoader__.load({
                       onClick: () => {
                         updateCurrentPreset((p) => ({
                           ...p,
-                          aggregator_fallbacks: [...(p.aggregator_fallbacks || []), { provider: 'opencode-go', model: 'deepseek-v4-flash' }],
+                          aggregator_fallbacks: [...(p.aggregator_fallbacks || []), { provider: (availableModels[0] && availableModels[0].provider) || '', model: (availableModels[0] && availableModels[0].model) || '' }],
                         }))
                       },
                     },

package/lib/history.js

@@ -25,7 +25,8 @@ export function getDefaultHistoryDir() {
     return process.env.DSH_HISTORY_DIR
   }
   if (process.env.DSH_HOME) {
-    return path.join(process.env.DSH_HOME, '.dsh')
+    const trimmed = process.env.DSH_HOME.trim()
+    return trimmed.endsWith('.dsh') ? trimmed : path.join(trimmed, '.dsh')
   }
   if (isTestEnvironment()) {
     return path.join(os.tmpdir(), '.dsh-test')
@@ -40,8 +41,6 @@ export function getDefaultHistoryFile() {
   return path.join(getDefaultHistoryDir(), 'moa-history.jsonl')
 }
 
-export const DEFAULT_HISTORY_DIR = getDefaultHistoryDir()
-export const DEFAULT_HISTORY_FILE = getDefaultHistoryFile()
 
 /** Max history file size before rotation (10 MB) */
 export const MAX_HISTORY_BYTES = 10 * 1024 * 1024
@@ -53,13 +52,6 @@ export function invalidateHistoryCache() {
   _historyCache = null
 }
 
-export function getHistoryFilePath(customDir) {
-  if (customDir) {
-    return path.join(customDir, '.moa-history.jsonl')
-  }
-  return getDefaultHistoryFile()
-}
-
 /**
  * Checks if the history file exceeds the size threshold and rotates it.
  * Moves current file to `${filePath}.1`, removing any older `.1` backup.
@@ -71,7 +63,7 @@ export function rotateHistoryFileIfNeeded(filePath = getDefaultHistoryFile(), ma
     if (stat.size >= maxBytes) {
       const backupPath = `${filePath}.1`
       if (fs.existsSync(backupPath)) {
-        try { fs.unlinkSync(backupPath) } catch (unlinkErr) { /* backup unlink best-effort */ }
+        try { fs.unlinkSync(backupPath) } catch { /* backup unlink best-effort */ }
       }
       fs.renameSync(filePath, backupPath)
       invalidateHistoryCache()
@@ -383,7 +375,7 @@ export function getMoaRunById(runId, filePath = getDefaultHistoryFile()) {
       try {
         const item = JSON.parse(lines[i])
         if (item && item.id === runId) return item
-      } catch (parseErr) { /* corrupt line skipped */ }
+      } catch { /* corrupt line skipped */ }
     }
     return null
   } catch {
@@ -412,7 +404,7 @@ export function exportMoaHistory(filePath = getDefaultHistoryFile(), options = {
         if (!item) continue
         if (presetFilter && presetFilter !== 'all' && item.preset !== presetFilter) continue
         records.push(item)
-      } catch (parseErr) { /* corrupt line skipped */ }
+      } catch { /* corrupt line skipped */ }
     }
 
     if (format === 'csv') {

package/lib/index.js

@@ -25,10 +25,8 @@ try {
   // safe fallback
 }
 import path from 'node:path'
-import os from 'node:os'
 import {
   parseMoACommand,
-  runMoAPipeline,
   streamMoATurn,
 } from './moa-runner.js'
 
@@ -36,7 +34,7 @@ import { registerMoaRoutes } from './routes.js'
 import { resolvePresetForPrompt } from './moa-router.js'
 
 import { createLiveCanvasClient } from './live-canvas.js'
-import { registerPluginUpdater, isSafeWriteRequest } from './updater.js'
+import { registerPluginUpdater } from './updater.js'
 
 export const name = '@goodandready/dsh-moa'
 export { collectProjectContext, formatProjectContext } from './file-workspace.js'
@@ -313,6 +311,15 @@ export function apply(ctx, config) {
   })
 
   // Session turn interceptor: route turn to real aggregator model & stream MoA synthesis
+
+  ctx.effect(() => {
+    return () => {
+      for (const entry of moaSessionTurns.values()) {
+        if (entry?.ttlTimer) clearTimeout(entry.ttlTimer)
+      }
+      moaSessionTurns.clear()
+    }
+  }, 'dsh-moa: session turns cleanup')
   const moaPendingTurns = new WeakMap()
   const moaSessionTurns = new Map()
 
@@ -345,7 +352,8 @@ export function apply(ctx, config) {
     return entry
   }
 
-  ctx.on('agent/pre-step', async (event, next) => {
+  ctx.effect(() => {
+    return ctx.on('agent/pre-step', async (event, next) => {
     const messages = event.messages || []
     const lastUserMsg = [...messages].reverse().find((m) => m && m.role === 'user')
     const userText = typeof lastUserMsg?.content === 'string'
@@ -404,9 +412,11 @@ export function apply(ctx, config) {
     }
 
     return next()
-  })
+    })
+  }, 'dsh-moa: agent pre-step interceptor')
 
-  ctx.on('agent/request', async (payload, next) => {
+  ctx.effect(() => {
+    return ctx.on('agent/request', async (payload, next) => {
     const resolved = await next()
     const turnContext = (payload.signal ? moaPendingTurns.get(payload.signal) : null)
       || (payload.session?.id ? getSessionTurn(payload.session.id) : null)
@@ -419,7 +429,8 @@ export function apply(ctx, config) {
       }
     }
     return resolved
-  })
+    })
+  }, 'dsh-moa: agent request interceptor')
 
   ctx.effect(() => {
     return ctx.on('llm/stream', (options, next) => {

package/lib/moa-context.js

@@ -46,19 +46,25 @@ export function pruneMultiTurnMessages(messages = [], maxHistoryTokens = 3000) {
   const nonSys = messages.filter((m) => m && m.role !== 'system')
   if (nonSys.length === 0) return pruned
 
-  // Always keep the final 2 turns (last user and prior assistant)
+  // Always keep up to the final 4 turns (last 2 user + assistant pairs)
   const recentTurns = nonSys.slice(-4)
 
+  // Calculate dynamic character budget derived from maxHistoryTokens (approx 4 chars per token)
+  const totalCharBudget = Math.max(1200, (Number(maxHistoryTokens) || 3000) * 4)
+  const maxTurnChars = Math.max(400, Math.floor(totalCharBudget / recentTurns.length))
+  const maxHead = Math.floor(maxTurnChars * 0.75)
+  const maxTail = Math.max(50, maxTurnChars - maxHead)
+
   for (let idx = 0; idx < recentTurns.length; idx++) {
     const msg = recentTurns[idx]
     const isLatest = idx === recentTurns.length - 1
     const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)
 
-    if (isLatest || content.length < 800) {
+    if (isLatest || content.length <= maxTurnChars) {
       pruned.push(msg)
     } else {
       // Prune long prior assistant or user text to protect candidate context
-      const truncated = content.slice(0, 750) + '\n\n[...context pruned for token efficiency...]\n' + content.slice(-250)
+      const truncated = content.slice(0, maxHead) + '\n\n[...context pruned for token efficiency...]\n' + content.slice(-maxTail)
       pruned.push({
         role: msg.role,
         content: truncated,

package/lib/moa-runner.js

@@ -1,15 +1,13 @@
 import { logger } from './logger.js'
-import path from 'node:path'
 import crypto from 'node:crypto'
-import { bestEffort } from './best-effort.js'
 import { extractFileBlocks, collectProjectContext, formatProjectContext, isRefinementTask, writeCandidateWorkspace, promoteCandidateWorkspace, cleanMoaWorkspaces, verifyFileSyntax } from './file-workspace.js'
 import { estimateTokenCost, summarizeMoAUsage } from './pricing.js'
 import { recordMoaRunAsync, candidatesForHistory, isTestEnvironment } 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'
+import { slotLabel, isBroadPromptRequiringQuestions, buildQuestionSynthesisPrompt, buildSynthesisPrompt, buildPeerCritiquePrompt } from './moa-prompts.js'
+import { parseWinnerIndex, parseRecommendedAssembler } from './moa-parser.js'
 import { REFERENCE_SYSTEM_PROMPT, callWithTransientRetry, runReferencesParallel } from './moa-candidates.js'
-import { executeTestGateForCandidates, runCandidateTestGate } from './moa-test-gate.js'
+import { executeTestGateForCandidates } from './moa-test-gate.js'
 import { executeMultiJudgePanel, buildCompositeBlockDirectives } from './moa-multi-judge.js'
 import { applyBudgetGuardrails } from './moa-budget.js'
 import { extractPriorTurnBaseline, pruneMultiTurnMessages } from './moa-context.js'

package/lib/moa-stream.js

@@ -109,8 +109,8 @@ export async function* streamMoATurn({ targetPreset, userPrompt, messages, callL
     yield {
       type: 'usage',
       usage: {
-        inputTokens: result?.usage?.totalTokens || 0,
-        outputTokens: Math.round((formatted.length || 0) / 4),
+        inputTokens: result?.usage?.totalInputTokens ?? (result?.usage?.totalTokens || 0),
+        outputTokens: result?.usage?.totalOutputTokens ?? Math.round((formatted.length || 0) / 4),
       },
     }
     yield { type: 'finish', reason: { kind: 'stop' } }

package/lib/pricing.js

@@ -20,7 +20,7 @@ export function getDefaultCacheFile() {
     return join(process.env.DSH_STORAGE_DIR, 'dsh-moa-catalog.json')
   }
   const baseDir = process.env.DSH_HOME
-    ? join(process.env.DSH_HOME, '.dsh')
+    ? (process.env.DSH_HOME.trim().endsWith('.dsh') ? process.env.DSH_HOME.trim() : join(process.env.DSH_HOME.trim(), '.dsh'))
     : join(homedir(), '.dsh')
   return join(baseDir, 'storages', 'dsh-moa-catalog.json')
 }
@@ -315,8 +315,10 @@ export function estimateTokenCost(slot = {}, usage = {}, customPrices = {}, cach
 
 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 totalInputTokens = (referenceOutputs || []).reduce((acc, r) => acc + (r.usage?.inputTokens || r.usage?.promptTokens || 0), 0) + (normAgg.inputTokens || normAgg.promptTokens || 0)
+  const totalOutputTokens = (referenceOutputs || []).reduce((acc, r) => acc + (r.usage?.outputTokens || r.usage?.completionTokens || 0), 0) + (normAgg.outputTokens || normAgg.completionTokens || 0)
+  const totalTokens = (referenceOutputs || []).reduce((acc, r) => acc + (r.usage?.totalTokens || 0), 0) + (normAgg.totalTokens || (totalInputTokens + totalOutputTokens))
   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 }
+  return { totalTokens, totalInputTokens, totalOutputTokens, totalCostUsd, candidates, aggregator: normAgg }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-moa",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",
@@ -54,10 +54,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.1.7-rc.2 || ^0.2.0-rc.1",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependenciesMeta": {