@goodandready/dsh-moa 0.2.21 → 0.2.22

package/lib/index.js

@@ -11,6 +11,18 @@ import { refreshCatalogInBackground } from './pricing.js'
  */
 
 import z from '@deepseek-ai/schemastery'
+
+// Ensure .volatile() helper exists on Schemastery schema prototype
+try {
+  const schemaProto = Object.getPrototypeOf(z.boolean())
+  if (schemaProto && typeof schemaProto.volatile !== 'function') {
+    schemaProto.volatile = function () {
+      return typeof this.extra === 'function' ? this.extra('volatile', true) : this
+    }
+  }
+} catch {
+  // safe fallback
+}
 import path from 'node:path'
 import os from 'node:os'
 import {
@@ -26,7 +38,7 @@ import { registerPluginUpdater, isSafeWriteRequest } from './updater.js'
 
 export const name = '@goodandready/dsh-moa'
 export { collectProjectContext, formatProjectContext } from './file-workspace.js'
-export const inject = ['webServer', 'llm', 'settings', 'sessions', 'tools']
+export const inject = ['webServer', 'llm', 'sessions', 'tools']
 
 export const NS = 'dsh-moa'
 
@@ -65,9 +77,9 @@ export const PresetSchema = z.object({
 })
 
 export const Config = z.object({
-  enabled: z.boolean().default(true),
-  default_preset: z.string().default('default'),
-  prices: z.dict(PriceRow).default({}),
+  enabled: z.boolean().default(true).volatile(),
+  default_preset: z.string().default('default').volatile(),
+  prices: z.dict(PriceRow).default({}).volatile(),
   presets: z.array(PresetSchema).default([
     {
       name: 'default',
@@ -110,31 +122,77 @@ export const Config = z.object({
       max_tokens: 8192,
       judge_criteria: '',
     },
-  ]),
+  ]).volatile(),
 })
 
 
+export function plainConfig(value) {
+  if (value && typeof value === 'object' && typeof value.get === 'function') {
+    return plainConfig(value.get())
+  }
+  if (Array.isArray(value)) {
+    return value.map(plainConfig)
+  }
+  if (value !== null && typeof value === 'object') {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, child]) => [key, plainConfig(child)])
+    )
+  }
+  return value
+}
+
 export function apply(ctx, config) {
   refreshCatalogInBackground()
 
-  let settingsScope = null
-  let getConfig = () => config
-  const live = () => Config(structuredClone(getConfig() ?? {})) ?? config
+  let localConfig = plainConfig(config ?? {})
+  const getConfig = () => localConfig
+  const live = () => {
+    try {
+      const raw = getConfig() ?? {}
+      const validated = Config(plainConfig(raw))
+      return plainConfig(validated) ?? localConfig
+    } catch {
+      return localConfig
+    }
+  }
+
+  let settingsService = null
 
+  // Optional policy hook for DSH 0.1.7 settings forms:
+  // Suppress auto-generated settings form since dsh-moa provides its own
+  // custom settings surface in settings.plugin.item.
   ctx.inject(['settings'], (sctx) => {
-    try {
-      const scope = sctx.settings.register(NS, Config, { base: config })
-      settingsScope = scope
-      getConfig = () => scope.get() ?? config
-      sctx.effect(() => () => {
-        settingsScope = null
-        getConfig = () => config
-      }, 'dsh-moa: settings')
-    } catch (e) {
-      console.warn('[dsh-moa] Settings registration warning:', e)
+    settingsService = sctx.settings
+    if (sctx.settings && typeof sctx.settings.configure === 'function') {
+      try {
+        const dispose = sctx.settings.configure({ auto: false }, ctx.fiber)
+        if (typeof sctx.effect === 'function') {
+          sctx.effect(() => () => {
+            dispose()
+            settingsService = null
+          }, 'dsh-moa: settings policy')
+        }
+      } catch {
+        // Safe fallback if configure is already registered or throws
+      }
     }
   })
 
+  const saveConfig = async (newFields) => {
+    const plain = plainConfig(newFields)
+    localConfig = { ...localConfig, ...plain }
+    try {
+      if (settingsService && typeof settingsService.replace === 'function') {
+        await settingsService.replace(NS, plain)
+      } else if (settingsService && typeof settingsService.update === 'function') {
+        await settingsService.update(NS, plain)
+      }
+    } catch (err) {
+      console.warn('[dsh-moa] Settings persistence warning:', err?.message || err)
+    }
+    return localConfig
+  }
+
   /**
    * Unified LLM dispatch function using ctx.llm.prepareCall / stream
    */
@@ -226,7 +284,9 @@ export function apply(ctx, config) {
     live,
     callLlm,
     liveCanvas,
-    getSettingsScope: () => settingsScope,
+    saveConfig,
+    Config,
+    plainConfig,
   })
 
   // Session turn interceptor: route turn to real aggregator model & stream MoA synthesis

package/lib/routes.js

@@ -38,21 +38,24 @@ function readBody(req) {
   })
 }
 
-export function registerMoaRoutes(ctx, { live, callLlm, liveCanvas, getSettingsScope }) {
-  const getScope = () => (typeof getSettingsScope === 'function' ? getSettingsScope() : null)
+export function registerMoaRoutes(ctx, { live, callLlm, liveCanvas, saveConfig, Config, plainConfig }) {
 
 ctx.effect(() => {
     return ctx.webServer.register({
       kind: 'exact',
       path: '/dsh-moa/status',
       handler: (_req, res) => {
-        const cfg = live()
-        writeJson(res, 200, {
-          ok: true,
-          enabled: cfg.enabled !== false,
-          defaultPreset: cfg.default_preset || 'default',
-          presetsCount: (cfg.presets || []).length,
-        })
+        try {
+          const cfg = live()
+          writeJson(res, 200, {
+            ok: true,
+            enabled: cfg.enabled !== false,
+            defaultPreset: cfg.default_preset || 'default',
+            presetsCount: (cfg.presets || []).length,
+          })
+        } catch (err) {
+          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
+        }
       },
     })
   }, 'dsh-moa: status route')
@@ -120,7 +123,12 @@ ctx.effect(() => {
 
         // Query settings for configured providers
         try {
-          const s = ctx.get ? ctx.get('settings') : ctx.settings
+          let s = null
+          try {
+            s = ctx.get ? ctx.get('settings') : null
+          } catch {
+            s = null
+          }
           const getSetting = (k) => {
             try { return s?.get?.(k) } catch { return undefined }
           }
@@ -196,19 +204,17 @@ ctx.effect(() => {
               return
             }
 
-            // Persist via Cordis Settings API
-            if (settingsScope && typeof settingsScope.replace === 'function') {
-              await settingsScope.replace(validated)
-            } else {
-              // In-memory fallback if settings service is unavailable
-              getConfig = () => validated
+            // Persist via saveConfig (in-memory and DSH profile settings)
+            if (typeof saveConfig === 'function') {
+              await saveConfig(validated)
             }
 
+            const unwrapped = typeof plainConfig === 'function' ? plainConfig(validated) : validated
             writeJson(res, 200, {
               ok: true,
-              enabled: validated.enabled !== false,
-              defaultPreset: validated.default_preset,
-              presets: validated.presets,
+              enabled: unwrapped.enabled !== false,
+              defaultPreset: unwrapped.default_preset,
+              presets: unwrapped.presets,
             })
           } catch (err) {
             writeJson(res, 400, { ok: false, error: err?.message || String(err) })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-moa",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",
@@ -59,5 +59,10 @@
     "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
     "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-settings": {
+      "optional": true
+    }
   }
 }