@goodandready/dsh-moa 0.2.26 → 0.2.29

package/lib/routes.js

@@ -11,6 +11,8 @@ import {
 import { promoteCandidateWorkspace, readCandidateFiles, computeLineDiff, isSafeRelativePath } from './file-workspace.js'
 import { isSafeWriteRequest } from './updater.js'
 import { runMoAPipeline } from './moa-runner.js'
+import { generateMoABenchmarkReport } from './moa-report.js'
+import { resolvePresetForPrompt } from './moa-router.js'
 
 let _modelsCache = { timestamp: 0, models: [] }
 const MODELS_CACHE_TTL = 60 * 1000
@@ -44,7 +46,11 @@ ctx.effect(() => {
     return ctx.webServer.register({
       kind: 'exact',
       path: '/dsh-moa/status',
-      handler: (_req, res) => {
+      handler: (req, res) => {
+        if (req.method !== 'GET') {
+          writeJson(res, 405, { ok: false, error: 'GET required' })
+          return
+        }
         try {
           const cfg = live()
           writeJson(res, 200, {
@@ -65,7 +71,11 @@ ctx.effect(() => {
     return ctx.webServer.register({
       kind: 'exact',
       path: '/dsh-moa/models',
-      handler: async (_req, res) => {
+      handler: async (req, res) => {
+        if (req.method !== 'GET') {
+          writeJson(res, 405, { ok: false, error: 'GET required' })
+          return
+        }
         if (_modelsCache.models.length > 0 && Date.now() - _modelsCache.timestamp < MODELS_CACHE_TTL) {
           writeJson(res, 200, { ok: true, models: _modelsCache.models, cached: true })
           return
@@ -92,7 +102,7 @@ ctx.effect(() => {
               }
             }
           } catch (e) {
-            console.warn('[dsh-moa] ctx.llm.listAvailableModels error:', e)
+            ctx.logger?.warn?.('[dsh-moa] ctx.llm.listAvailableModels error:', e)
           }
 
           try {
@@ -117,7 +127,7 @@ ctx.effect(() => {
               await Promise.allSettled(queries)
             }
           } catch (e) {
-            console.warn('[dsh-moa] ctx.llm.listConfigurableProviders error:', e)
+            ctx.logger?.warn?.('[dsh-moa] ctx.llm.listConfigurableProviders error:', e)
           }
         }
 
@@ -154,7 +164,7 @@ ctx.effect(() => {
             }
           }
         } catch (e) {
-          console.warn('[dsh-moa] Error reading settings:', e)
+          ctx.logger?.warn?.('[dsh-moa] Error reading settings:', e)
         }
 
         _modelsCache = { timestamp: Date.now(), models: result }
@@ -239,8 +249,10 @@ ctx.effect(() => {
         }
         try {
           const u = new URL(req.url, 'http://localhost')
-          const limit = parseInt(u.searchParams.get('limit') || '20', 10)
-          const offset = parseInt(u.searchParams.get('offset') || '0', 10)
+          const rawLimit = parseInt(u.searchParams.get('limit') || '20', 10)
+          const rawOffset = parseInt(u.searchParams.get('offset') || '0', 10)
+          const limit = Math.max(1, Math.min(100, Number.isFinite(rawLimit) ? rawLimit : 20))
+          const offset = Math.max(0, Number.isFinite(rawOffset) ? rawOffset : 0)
           const data = getMoaHistory(limit, offset)
           writeJson(res, 200, { ok: true, ...data })
         } catch (err) {
@@ -423,16 +435,83 @@ ctx.effect(() => {
         const urlPath = req.url.split('?')[0]
         const parts = urlPath.split('/').filter(Boolean)
         const runId = parts[2] || ''
+        const isReport = parts[3] === 'report'
         const run = runId ? getMoaRunById(runId) : null
         if (!run) {
           writeJson(res, 404, { ok: false, error: 'Run not found' })
           return
         }
+        if (isReport) {
+          const u = new URL(req.url, 'http://127.0.0.1')
+          const format = u.searchParams.get('format') || 'md'
+          const report = run.benchmarkReport || generateMoABenchmarkReport({
+            runId: run.id,
+            timestamp: run.timestamp,
+            preset: run.preset,
+            prompt: run.prompt,
+            durationMs: run.durationMs,
+            usage: { totalTokens: run.totalTokens },
+            costUsd: run.totalCostUsd,
+            candidates: run.candidates,
+            winningIndex: run.winnerIndex,
+            winningLabel: run.winnerModel,
+          })
+          if (format === 'json') {
+            writeJson(res, 200, { ok: true, report: typeof report === 'object' ? (report.json || report) : report })
+            return
+          }
+          const mdText = typeof report === 'string' ? report : (report.markdown || JSON.stringify(report, null, 2))
+          res.writeHead(200, { 'Content-Type': 'text/markdown; charset=utf-8' })
+          res.end(mdText)
+          return
+        }
         writeJson(res, 200, { ok: true, run })
       },
     })
   }, 'dsh-moa: run by id route')
 
+  // Route: /dsh-moa/route-preset
+  ctx.effect(() => {
+    return ctx.webServer.register({
+      kind: 'exact',
+      path: '/dsh-moa/route-preset',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') {
+          writeJson(res, 405, { ok: false, error: 'POST required' })
+          return
+        }
+        if (!isSafeWriteRequest(req)) {
+          writeJson(res, 403, { ok: false, error: 'Forbidden: cross-site request rejected' })
+          return
+        }
+        try {
+          const cfg = live()
+          if (cfg.enabled === false) {
+            writeJson(res, 400, { ok: false, error: 'MoA is disabled in settings' })
+            return
+          }
+          const raw = await readBody(req)
+          const body = JSON.parse(raw || '{}')
+          const prompt = body?.prompt || ''
+          const result = await resolvePresetForPrompt({
+            prompt,
+            presets: cfg.presets || [],
+            defaultPreset: cfg.default_preset || 'default',
+            routingModel: cfg.smart_routing_model,
+            callLlm,
+            enabled: cfg.enabled !== false,
+          })
+          writeJson(res, 200, { ok: true, ...result })
+        } catch (err) {
+          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
+        }
+      },
+    })
+  }, 'dsh-moa: route preset endpoint')
+
+  let _lastRunTimestamp = 0
+  const RUN_MIN_INTERVAL_MS = 1000
+
   // Route: /dsh-moa/run
   ctx.effect(() => {
     return ctx.webServer.register({
@@ -447,6 +526,12 @@ ctx.effect(() => {
           writeJson(res, 403, { ok: false, error: 'Forbidden: cross-site request rejected' })
           return
         }
+        const now = Date.now()
+        if (now - _lastRunTimestamp < RUN_MIN_INTERVAL_MS) {
+          writeJson(res, 429, { ok: false, error: 'Rate limit exceeded: please wait before starting another run' })
+          return
+        }
+        _lastRunTimestamp = now
 
         try {
           const raw = await readBody(req)

package/package.json

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