@goodandready/dsh-moa 0.2.9 → 0.2.10

package/lib/index.js

@@ -6,7 +6,7 @@ import { refreshCatalogInBackground } from './pricing.js'
  * 1. User issues /moa <prompt>
  * 2. Parallel candidate proposers write to isolated workspaces (.moa/candidate-X/)
  * 3. Aggregator evaluates and synthesizes the optimal solution
- * 4. Winner candidate files are promoted to the project root and previewed in Live Canvas
+ * 4. Winner candidate files are promoted to the project root
  * 5. Native cost tracking, history logging and leaderboard analytics
  */
 
@@ -25,6 +25,8 @@ import {
   getMoaRunById,
 } from './history.js'
 
+import { createLiveCanvasClient } from './live-canvas.js'
+
 export const name = 'dsh-moa'
 export const inject = ['webServer', 'llm', 'settings', 'sessions', 'tools']
 
@@ -45,13 +47,17 @@ export const PresetSchema = z.object({
   name: z.string(),
   enabled: z.boolean().default(true),
   ask_clarifying_questions: z.boolean().default(true),
+  curator_synthesis: z.boolean().default(false),
+  stream_aggregator: z.boolean().default(true),
+  quorum_enabled: z.boolean().default(false),
+  grace_period_sec: z.number().default(10),
   reference_models: z.array(ModelSlotSchema).default([]),
   aggregator: ModelSlotSchema.default({ provider: 'codex', model: 'gpt-5.6-sol' }),
+  aggregator_fallbacks: z.array(ModelSlotSchema).default([]),
   reference_temperature: z.number().default(0.6),
   aggregator_temperature: z.number().default(0.4),
   max_tokens: z.number().default(4096),
   judge_criteria: z.string().default(''),
-  judge_mode: z.string().default('auto'),
 })
 
 export const Config = z.object({
@@ -72,7 +78,6 @@ export const Config = z.object({
       aggregator_temperature: 0.4,
       max_tokens: 4096,
       judge_criteria: '',
-      judge_mode: 'auto',
     },
     {
       name: 'fast',
@@ -86,7 +91,6 @@ export const Config = z.object({
       aggregator_temperature: 0.2,
       max_tokens: 4096,
       judge_criteria: '',
-      judge_mode: 'auto',
     },
     {
       name: 'deep-reasoning',
@@ -100,8 +104,7 @@ export const Config = z.object({
       reference_temperature: 0.6,
       aggregator_temperature: 0.2,
       max_tokens: 8192,
-      judge_criteria: 'Приоритет: математическая строгость и отсутствие галлюцинаций',
-      judge_mode: 'auto',
+      judge_criteria: '',
     },
   ]),
 })
@@ -153,7 +156,7 @@ export function apply(ctx, config) {
   /**
    * Unified LLM dispatch function using ctx.llm.prepareCall / stream
    */
-  const callLlm = async ({ provider, model, messages, temperature = 0.6, maxTokens = 4096 }) => {
+  const callLlm = async ({ provider, model, messages, temperature = 0.6, maxTokens = 4096, onStreamDelta }) => {
     if (!ctx.llm) {
       throw new Error('ctx.llm is not available in cordis context')
     }
@@ -195,6 +198,9 @@ export function apply(ctx, config) {
       for await (const chunk of stream) {
         if (chunk.type === 'text-delta' && typeof chunk.text === 'string') {
           fullText += chunk.text
+          if (typeof onStreamDelta === 'function') {
+            onStreamDelta(chunk.text)
+          }
         } else if (chunk.type === 'block-end' && chunk.block?.text) {
           if (!fullText) fullText = chunk.block.text
         } else if (chunk.type === 'usage' && chunk.usage) {
@@ -217,6 +223,11 @@ export function apply(ctx, config) {
     }
   }
 
+  // Optional Live Canvas preview client: the harness port is resolved per
+  // call and any failure degrades to "no preview link" (live-canvas is not
+  // required to be installed).
+  const liveCanvas = createLiveCanvasClient({ getPort: () => ctx.webServer?.port })
+
   // Route: /dsh-moa/status
   ctx.effect(() => {
     return ctx.webServer.register({
@@ -342,23 +353,35 @@ export function apply(ctx, config) {
             const raw = await readBody(req)
             const payload = JSON.parse(raw)
             const newConfig = {
-              enabled: cfg.enabled !== false,
+              enabled: typeof payload.enabled === 'boolean' ? payload.enabled : cfg.enabled !== false,
               default_preset: payload.default_preset || cfg.default_preset || 'default',
               presets: Array.isArray(payload.presets) ? payload.presets : (cfg.presets || []),
             }
 
+            // Validate the merged payload through the plugin schema before it
+            // reaches the settings storage: malformed payloads must be
+            // rejected with 400 instead of being persisted.
+            let validated
+            try {
+              validated = Config(structuredClone(newConfig))
+            } catch (verr) {
+              writeJson(res, 400, { ok: false, error: 'Invalid presets payload: ' + (verr?.message || String(verr)) })
+              return
+            }
+
             // Persist via Cordis Settings API
             if (settingsScope && typeof settingsScope.replace === 'function') {
-              await settingsScope.replace(newConfig)
+              await settingsScope.replace(validated)
             } else {
               // In-memory fallback if settings service is unavailable
-              getConfig = () => newConfig
+              getConfig = () => validated
             }
 
             writeJson(res, 200, {
               ok: true,
-              defaultPreset: newConfig.default_preset,
-              presets: newConfig.presets,
+              enabled: validated.enabled !== false,
+              defaultPreset: validated.default_preset,
+              presets: validated.presets,
             })
           } catch (err) {
             writeJson(res, 400, { ok: false, error: err?.message || String(err) })
@@ -414,6 +437,29 @@ export function apply(ctx, config) {
     })
   }, 'dsh-moa: leaderboard route')
 
+  // Route: /dsh-moa/runs/<id> (run replay by id)
+  ctx.effect(() => {
+    return ctx.webServer.register({
+      kind: 'prefix',
+      path: '/dsh-moa/runs/',
+      handler: (req, res) => {
+        if (req.method !== 'GET') {
+          writeJson(res, 405, { ok: false, error: 'GET required' })
+          return
+        }
+        const urlPath = req.url.split('?')[0]
+        const parts = urlPath.split('/').filter(Boolean)
+        const runId = parts[2] || ''
+        const run = runId ? getMoaRunById(runId) : null
+        if (!run) {
+          writeJson(res, 404, { ok: false, error: 'Run not found' })
+          return
+        }
+        writeJson(res, 200, { ok: true, run })
+      },
+    })
+  }, 'dsh-moa: run by id route')
+
   // Route: /dsh-moa/run
   ctx.effect(() => {
     return ctx.webServer.register({
@@ -435,6 +481,10 @@ export function apply(ctx, config) {
           }
 
           const cfg = live()
+          if (cfg.enabled === false) {
+            writeJson(res, 400, { ok: false, error: 'MoA is disabled in settings' })
+            return
+          }
           const presetName = payload.preset || cfg.default_preset || 'default'
           const preset = (cfg.presets || []).find((p) => p.name === presetName) || cfg.presets?.[0]
 
@@ -444,6 +494,8 @@ export function apply(ctx, config) {
             preset,
             callLlm,
             cwd: payload.cwd || process.cwd(),
+            prices: cfg.prices || {},
+            liveCanvas,
           })
 
           writeJson(res, 200, { ok: true, ...result })
@@ -511,6 +563,8 @@ export function apply(ctx, config) {
           cwd: sessCwd,
           aggregator: { provider: aggProvider, model: aggModel },
           callLlm,
+          prices: cfg.prices || {},
+          liveCanvas,
         }
 
         if (event.signal) {

package/lib/live-canvas.js

@@ -0,0 +1,34 @@
+/**
+ * Optional Live Canvas preview client (@goodandready/dsh-live-canvas).
+ *
+ * The plugin posts the promoted HTML to live-canvas's own REST contract
+ * (POST /dsh-live-canvas/api/preview, served by the same harness webServer),
+ * so no cross-plugin service coupling or module imports are needed. Any
+ * failure — live-canvas not installed, endpoint missing, timeout, malformed
+ * response — degrades to null and the MoA answer simply carries no preview
+ * link, without errors in the harness log.
+ */
+export function createLiveCanvasClient({ getPort, fetchImpl = globalThis.fetch, timeoutMs = 3000 } = {}) {
+  if (typeof fetchImpl !== 'function') return null
+  return {
+    async createPreviewFromContent({ content, title, filePath } = {}) {
+      if (!content || typeof content !== 'string') return null
+      const port = typeof getPort === 'function' ? getPort() : getPort
+      if (!port) return null
+      try {
+        const res = await fetchImpl(`http://127.0.0.1:${port}/dsh-live-canvas/api/preview`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ content, title, filePath }),
+          signal: AbortSignal.timeout(timeoutMs),
+        })
+        if (!res.ok) return null
+        const data = await res.json()
+        if (!data || data.success !== true || !data.canvasId || !data.previewUrl) return null
+        return { canvasId: data.canvasId, previewUrl: data.previewUrl, title: title || 'Live Preview' }
+      } catch {
+        return null
+      }
+    },
+  }
+}