@goodandready/dsh-moa 0.2.15 → 0.2.16

package/README.md

@@ -282,6 +282,13 @@ npm test
 
 ---
 
+
+## 🛠️ Internal Tooling & Development
+
+For local verification and package integrity validation:
+- `npm test`: runs the full test suite (95 tests)
+- `./deploy.sh`: local infrastructure validation script (verifies package size, identity parity in package.json/cordis.patch.yml/client.js, and tests). Excluded from the published npm package.
+
 ## 📄 License
 
 MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)

package/lib/best-effort.js

@@ -0,0 +1,38 @@
+/**
+ * Run a non-critical side effect; never throw.
+ * Logs at debug/warn when a logger is provided or via console.debug.
+ *
+ * @param {string} label - Context identifier for telemetry / diagnostics
+ * @param {Function} fn - Operation to execute
+ * @param {object} [logger] - Optional logger instance
+ */
+export function bestEffort(label, fn, logger) {
+  const log = (err) => {
+    try {
+      if (logger && typeof logger.debug === 'function') {
+        logger.debug(`[dsh-moa:bestEffort] ${label}:`, err?.message || err)
+      } else if (typeof console !== 'undefined' && typeof console.debug === 'function') {
+        console.debug(`[dsh-moa:bestEffort] ${label}:`, err?.message || err)
+      }
+    } catch {
+      // Logger itself must never crash the process
+    }
+  }
+
+  try {
+    const result = fn()
+    if (result && typeof result.then === 'function') {
+      return result.then(
+        (value) => value,
+        (err) => {
+          log(err)
+          return undefined
+        }
+      )
+    }
+    return result
+  } catch (err) {
+    log(err)
+    return undefined
+  }
+}

package/lib/client.js

@@ -1444,7 +1444,7 @@ window.__ModuleLoader__.load({
       const snapshot = React.useSyncExternalStore
         ? React.useSyncExternalStore(
             React.useMemo(() => (cb) => (scope ? scope.subscribe(cb) : () => {}), [scope]),
-            React.useCallback(() => (scope ? scope.getSnapshot() : { status: 'ready' }), [scope]),
+            React.useCallback(() => (scope ? scope.getSnapshot() : { status: 'unavailable' }), [scope]),
             React.useCallback(() => ({ status: 'loading' }), [])
           )
         : null
@@ -1461,8 +1461,11 @@ window.__ModuleLoader__.load({
       const [leaderboardPresetFilter, setLeaderboardPresetFilter] = React.useState('all')
 
       React.useEffect(() => {
-        if (!scope || !snapshot) return
-        const snapStatus = snapshot.status || 'ready'
+        if (!scope || !snapshot) {
+          setStatus('unavailable')
+          return
+        }
+        const snapStatus = snapshot.status || 'unavailable'
         if (snapStatus === 'ready') {
           const val = snapshot.value || {}
           if (Array.isArray(val.presets)) setPresets(val.presets)
@@ -1730,7 +1733,7 @@ window.__ModuleLoader__.load({
           return () => {
             for (const off of undo) {
               if (typeof off === 'function') {
-                try { off() } catch {}
+                try { off() } catch (offErr) { /* unsubscribe best-effort */ }
               }
             }
           }

package/lib/file-workspace.js

@@ -1,3 +1,4 @@
+import { bestEffort } from './best-effort.js'
 import vm from 'node:vm'
 import fs from 'node:fs/promises'
 import path from 'node:path'
@@ -114,43 +115,55 @@ export async function collectProjectContext(baseDir, maxCharBudget = 16000) {
   const collected = []
   let totalChars = 0
 
+  let skippedFiles = 0
+  const skippedList = []
+
   async function scan(currentDir, relPrefix = '') {
     if (totalChars >= maxCharBudget) return
+    let list
     try {
-      const list = await fs.readdir(currentDir, { withFileTypes: true })
-      for (const item of list) {
-        if (totalChars >= maxCharBudget) break
-        // Skip all dotfiles, including .env and .env.* variants: their
-        // contents must never be shipped to third-party model providers.
-        if (item.name.startsWith('.')) continue
+      list = await fs.readdir(currentDir, { withFileTypes: true })
+    } catch (readDirErr) {
+      skippedFiles++
+      skippedList.push(relPrefix || '.')
+      return
+    }
 
-        const rel = relPrefix ? `${relPrefix}/${item.name}` : item.name
-        const full = path.join(currentDir, item.name)
+    for (const item of list) {
+      if (totalChars >= maxCharBudget) break
+      // Skip all dotfiles, including .env and .env.* variants: their
+      // contents must never be shipped to third-party model providers.
+      if (item.name.startsWith('.')) continue
 
-        if (item.isDirectory()) {
-          if (!ignoreDirs.has(item.name)) {
-            await scan(full, rel)
-          }
-        } else if (item.isFile()) {
-          const ext = path.extname(item.name).toLowerCase()
-          if (codeExts.has(ext)) {
-            try {
-              const stat = await fs.stat(full)
-              if (stat.size > 100000) continue // skip files > 100kb
-              const content = await fs.readFile(full, 'utf8')
-              const budgetRemaining = maxCharBudget - totalChars
-              const truncated = content.length > budgetRemaining ? content.slice(0, budgetRemaining) + '\n... [truncated]' : content
-              totalChars += truncated.length
-              collected.push({ relativePath: rel, content: truncated, size: stat.size })
-            } catch {}
+      const rel = relPrefix ? `${relPrefix}/${item.name}` : item.name
+      const full = path.join(currentDir, item.name)
+
+      if (item.isDirectory()) {
+        if (!ignoreDirs.has(item.name)) {
+          await scan(full, rel)
+        }
+      } else if (item.isFile()) {
+        const ext = path.extname(item.name).toLowerCase()
+        if (codeExts.has(ext)) {
+          try {
+            const stat = await fs.stat(full)
+            if (stat.size > 100000) continue // skip files > 100kb
+            const content = await fs.readFile(full, 'utf8')
+            const budgetRemaining = maxCharBudget - totalChars
+            const truncated = content.length > budgetRemaining ? content.slice(0, budgetRemaining) + '\n... [truncated]' : content
+            totalChars += truncated.length
+            collected.push({ relativePath: rel, content: truncated, size: stat.size })
+          } catch (fileErr) {
+            skippedFiles++
+            skippedList.push(rel)
           }
         }
       }
-    } catch {}
+    }
   }
 
   await scan(baseDir)
-  return { files: collected, totalChars }
+  return { files: collected, totalChars, skippedFiles, skippedList }
 }
 
 /**
@@ -224,7 +237,7 @@ export async function promoteCandidateWorkspace(baseDir, winningIndex, options =
     const entries = await getFilesRecursively(winningDir)
     if (entries.length === 0) {
       if (!options.keepMoa) {
-        try { await fs.rm(moaRoot, { recursive: true, force: true }) } catch {}
+        await bestEffort('clean moaRoot on empty candidate', () => fs.rm(moaRoot, { recursive: true, force: true }))
       }
       return []
     }
@@ -247,7 +260,7 @@ export async function promoteCandidateWorkspace(baseDir, winningIndex, options =
     return promoted
   } catch (err) {
     if (!options.keepMoa) {
-      try { await fs.rm(moaRoot, { recursive: true, force: true }) } catch {}
+      await bestEffort('clean moaRoot on promote error', () => fs.rm(moaRoot, { recursive: true, force: true }))
     }
     return []
   }
@@ -259,9 +272,7 @@ export async function promoteCandidateWorkspace(baseDir, winningIndex, options =
 export async function cleanMoaWorkspaces(baseDir) {
   if (!baseDir) return
   const moaRoot = path.join(baseDir, '.moa')
-  try {
-    await fs.rm(moaRoot, { recursive: true, force: true })
-  } catch {}
+  await bestEffort('cleanMoaWorkspaces', () => fs.rm(moaRoot, { recursive: true, force: true }))
 }
 
 async function getFilesRecursively(dir) {
@@ -269,13 +280,14 @@ async function getFilesRecursively(dir) {
   try {
     const stat = await fs.stat(dir)
     if (!stat.isDirectory()) return []
-  } catch {
+  } catch (statErr) {
     return []
   }
 
   async function scan(current, relPrefix = '') {
+    let list
     try {
-      const list = await fs.readdir(current, { withFileTypes: true })
+      list = await fs.readdir(current, { withFileTypes: true })
       for (const item of list) {
         const rel = relPrefix ? `${relPrefix}/${item.name}` : item.name
         const full = path.join(current, item.name)
@@ -285,7 +297,9 @@ async function getFilesRecursively(dir) {
           results.push(rel)
         }
       }
-    } catch {}
+    } catch (readErr) {
+      return
+    }
   }
   await scan(dir)
   return results

package/lib/history.js

@@ -15,7 +15,7 @@ const DEFAULT_HISTORY_FILE = path.join(DEFAULT_HISTORY_DIR, 'moa-history.jsonl')
 /** Max history file size before rotation (10 MB) */
 export const MAX_HISTORY_BYTES = 10 * 1024 * 1024
 
-export function getHistoryFilePath(customDir) {
+function getHistoryFilePath(customDir) {
   if (customDir) {
     return path.join(customDir, '.moa-history.jsonl')
   }
@@ -33,7 +33,7 @@ export function rotateHistoryFileIfNeeded(filePath = DEFAULT_HISTORY_FILE, maxBy
     if (stat.size >= maxBytes) {
       const backupPath = `${filePath}.1`
       if (fs.existsSync(backupPath)) {
-        try { fs.unlinkSync(backupPath) } catch {}
+        try { fs.unlinkSync(backupPath) } catch (unlinkErr) { /* backup unlink best-effort */ }
       }
       fs.renameSync(filePath, backupPath)
       return true
@@ -241,7 +241,7 @@ export function getMoaRunById(runId, filePath = DEFAULT_HISTORY_FILE) {
       try {
         const item = JSON.parse(lines[i])
         if (item && item.id === runId) return item
-      } catch {}
+      } catch (parseErr) { /* corrupt line skipped */ }
     }
     return null
   } catch {
@@ -270,7 +270,7 @@ export function exportMoaHistory(filePath = DEFAULT_HISTORY_FILE, options = {})
         if (!item) continue
         if (presetFilter && presetFilter !== 'all' && item.preset !== presetFilter) continue
         records.push(item)
-      } catch {}
+      } catch (parseErr) { /* corrupt line skipped */ }
     }
 
     if (format === 'csv') {

package/lib/index.js

@@ -19,17 +19,12 @@ import {
   streamMoATurn,
 } from './moa-runner.js'
 
-import {
-  getMoaHistory,
-  getMoaLeaderboard,
-  getMoaRunById,
-  exportMoaHistory,
-} from './history.js'
-import { promoteCandidateWorkspace } from './file-workspace.js'
+import { registerMoaRoutes } from './routes.js'
 
 import { createLiveCanvasClient } from './live-canvas.js'
+import { registerPluginUpdater, isSafeWriteRequest } from './updater.js'
 
-export const name = 'dsh-moa'
+export const name = '@goodandready/dsh-moa'
 export const inject = ['webServer', 'llm', 'settings', 'sessions', 'tools']
 
 export const NS = 'dsh-moa'
@@ -117,28 +112,6 @@ export const Config = z.object({
   ]),
 })
 
-function writeJson(res, status, body) {
-  res.writeHead(status, {
-    'Content-Type': 'application/json; charset=utf-8',
-    'Cache-Control': 'no-store',
-  })
-  res.end(JSON.stringify(body))
-}
-
-function readBody(req) {
-  return new Promise((resolve, reject) => {
-    let acc = ''
-    req.on('data', (chunk) => {
-      acc += chunk
-      if (acc.length > 5 * 1024 * 1024) {
-        req.destroy()
-        reject(new Error('Payload Too Large'))
-      }
-    })
-    req.on('end', () => resolve(acc))
-    req.on('error', reject)
-  })
-}
 
 export function apply(ctx, config) {
   refreshCatalogInBackground()
@@ -238,361 +211,23 @@ export function apply(ctx, config) {
   const liveCanvas = createLiveCanvasClient({ getPort: () => ctx.webServer?.port })
 
   // Route: /dsh-moa/status
+  // Register one-click updater endpoint
   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,
-        })
-      },
+    return registerPluginUpdater(ctx, {
+      endpoint: '/api/dsh-moa/update',
+      packageName: '@goodandready/dsh-moa',
+      manifestUrl: new URL('../package.json', import.meta.url),
     })
-  }, 'dsh-moa: status route')
-
-  // Route: /dsh-moa/models
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/models',
-      handler: async (_req, res) => {
-        const result = []
-        const seen = new Set()
-
-        const add = (p, m) => {
-          if (!p || !m) return
-          const key = `${p}:${m}`
-          if (!seen.has(key)) {
-            seen.add(key)
-            result.push({ provider: p, model: m, label: key })
-          }
-        }
-
-        if (ctx.llm) {
-          try {
-            if (typeof ctx.llm.listAvailableModels === 'function') {
-              const list = await ctx.llm.listAvailableModels()
-              for (const item of (list || [])) {
-                if (item?.provider && item?.id) add(item.provider, item.id)
-              }
-            }
-          } catch (e) {
-            console.warn('[dsh-moa] ctx.llm.listAvailableModels error:', e)
-          }
-
-          try {
-            if (typeof ctx.llm.listConfigurableProviders === 'function') {
-              const cProvs = ctx.llm.listConfigurableProviders() || []
-              for (const cp of cProvs) {
-                const cpId = cp.provider || cp.id
-                if (cpId && typeof ctx.llm.listModels === 'function') {
-                  try {
-                    const mList = await ctx.llm.listModels(cpId)
-                    for (const m of (mList || [])) {
-                      const mId = typeof m === 'string' ? m : (m.id || m.model || m.name)
-                      if (mId) add(cpId, mId)
-                    }
-                  } catch {}
-                }
-              }
-            }
-          } catch (e) {
-            console.warn('[dsh-moa] ctx.llm.listConfigurableProviders error:', e)
-          }
-        }
-
-        // Query settings for configured providers
-        try {
-          const s = ctx.get ? ctx.get('settings') : ctx.settings
-          const getSetting = (k) => {
-            try { return s?.get?.(k) } catch { return undefined }
-          }
-
-          const def = getSetting('agent-default-model')
-          if (def?.provider && def?.model) {
-            add(def.provider, def.model)
-          }
-
-          const piAi = getSetting('llm-pi-ai')
-          for (const [pName, pData] of Object.entries(piAi?.providers || {})) {
-            for (const m of (pData?.models || [])) {
-              const mId = typeof m === 'string' ? m : (m?.id || m?.model)
-              if (mId) add(pName, mId)
-            }
-          }
-
-          const sync = getSetting('dsh-model-sync')
-          for (const [syncProv, syncModels] of Object.entries(sync?.modelCatalogs || {})) {
-            for (const m of (syncModels || [])) {
-              const mId = typeof m === 'string' ? m : (m?.id || m?.model)
-              if (mId) add(syncProv, mId)
-            }
-          }
-        } catch (e) {
-          console.warn('[dsh-moa] Error reading settings:', e)
-        }
-
-        writeJson(res, 200, { ok: true, models: result })
-      },
-    })
-  }, 'dsh-moa: models route')
-
-  // Route: /dsh-moa/presets
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/presets',
-      handler: async (req, res) => {
-        const cfg = live()
-        if (req.method === 'GET') {
-          writeJson(res, 200, {
-            ok: true,
-            defaultPreset: cfg.default_preset || 'default',
-            presets: cfg.presets || [],
-          })
-          return
-        }
-
-        if (req.method === 'POST' || req.method === 'PUT') {
-          try {
-            const raw = await readBody(req)
-            const payload = JSON.parse(raw)
-            const newConfig = {
-              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(validated)
-            } else {
-              // In-memory fallback if settings service is unavailable
-              getConfig = () => validated
-            }
-
-            writeJson(res, 200, {
-              ok: true,
-              enabled: validated.enabled !== false,
-              defaultPreset: validated.default_preset,
-              presets: validated.presets,
-            })
-          } catch (err) {
-            writeJson(res, 400, { ok: false, error: err?.message || String(err) })
-          }
-          return
-        }
-
-        writeJson(res, 405, { ok: false, error: 'Method Not Allowed' })
-      },
-    })
-  }, 'dsh-moa: presets route')
-
-  // Route: /dsh-moa/history (#9)
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/history',
-      handler: async (req, res) => {
-        if (req.method !== 'GET') {
-          writeJson(res, 405, { ok: false, error: 'GET required' })
-          return
-        }
-        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 data = getMoaHistory(limit, offset)
-          writeJson(res, 200, { ok: true, ...data })
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
-        }
-      },
-    })
-  }, 'dsh-moa: history route')
-
-  // Route: /dsh-moa/leaderboard
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/leaderboard',
-      handler: async (req, res) => {
-        if (req.method !== 'GET') {
-          writeJson(res, 405, { ok: false, error: 'GET required' })
-          return
-        }
-        try {
-          const url = new URL(req.url || '', 'http://127.0.0.1')
-          const preset = url.searchParams.get('preset') || null
-          const format = url.searchParams.get('format') || 'json'
-
-          if (format === 'csv') {
-            const csv = exportMoaHistory(undefined, { format: 'csv', preset })
-            res.writeHead(200, {
-              'Content-Type': 'text/csv; charset=utf-8',
-              'Content-Disposition': 'attachment; filename="moa-leaderboard.csv"',
-            })
-            res.end(csv)
-            return
-          }
-
-          const data = getMoaLeaderboard(undefined, { preset })
-          writeJson(res, 200, { ok: true, ...data })
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
-        }
-      },
-    })
-  }, 'dsh-moa: leaderboard route')
-
-  // Route: /dsh-moa/promote (Candidate Override Action)
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/promote',
-      handler: async (req, res) => {
-        if (req.method !== 'POST') {
-          writeJson(res, 405, { ok: false, error: 'POST required' })
-          return
-        }
-        try {
-          const raw = await readBody(req)
-          const body = JSON.parse(raw || '{}')
-          const candidateIndex = parseInt(body?.candidateIndex, 10)
-          if (isNaN(candidateIndex) || candidateIndex < 1) {
-            writeJson(res, 400, { ok: false, error: 'Valid candidateIndex required (>= 1)' })
-            return
-          }
-          const cwd = body?.cwd || process.cwd()
-          const promotedFiles = await promoteCandidateWorkspace(cwd, candidateIndex, { keepMoa: true })
-          writeJson(res, 200, { ok: true, candidateIndex, promotedFiles })
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
-        }
-      },
-    })
-  }, 'dsh-moa: promote candidate route')
-
-  // Route: /dsh-moa/history/export
-  ctx.effect(() => {
-    return ctx.webServer.register({
-      kind: 'exact',
-      path: '/dsh-moa/history/export',
-      handler: async (req, res) => {
-        if (req.method !== 'GET') {
-          writeJson(res, 405, { ok: false, error: 'GET required' })
-          return
-        }
-        try {
-          const url = new URL(req.url || '', 'http://127.0.0.1')
-          const preset = url.searchParams.get('preset') || null
-          const format = url.searchParams.get('format') || 'json'
-          const data = exportMoaHistory(undefined, { format, preset })
-
-          if (format === 'csv') {
-            res.writeHead(200, {
-              'Content-Type': 'text/csv; charset=utf-8',
-              'Content-Disposition': 'attachment; filename="moa-history.csv"',
-            })
-            res.end(data)
-            return
-          }
-
-          res.writeHead(200, {
-            'Content-Type': 'application/json; charset=utf-8',
-            'Content-Disposition': 'attachment; filename="moa-history.json"',
-          })
-          res.end(data)
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
-        }
-      },
-    })
-  }, 'dsh-moa: history export 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({
-      kind: 'exact',
-      path: '/dsh-moa/run',
-      handler: async (req, res) => {
-        if (req.method !== 'POST') {
-          writeJson(res, 405, { ok: false, error: 'POST required' })
-          return
-        }
-
-        try {
-          const raw = await readBody(req)
-          const payload = JSON.parse(raw)
-          const prompt = payload.prompt || ''
-          if (!prompt.trim()) {
-            writeJson(res, 400, { ok: false, error: 'Empty prompt' })
-            return
-          }
+  }, 'dsh-moa: plugin updater route')
+
+  // Route dispatch: req.method verified fail-closed in lib/routes.js
+  registerMoaRoutes(ctx, {
+    live,
+    callLlm,
+    liveCanvas,
+    getSettingsScope: () => settingsScope,
+  })
 
-          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]
-
-          const result = await runMoAPipeline({
-            userPrompt: prompt,
-            messages: payload.messages || [],
-            preset,
-            callLlm,
-            cwd: payload.cwd || process.cwd(),
-            prices: cfg.prices || {},
-            liveCanvas,
-          })
-
-          writeJson(res, 200, { ok: true, ...result })
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: err?.message || String(err) })
-        }
-      },
-    })
-  }, 'dsh-moa: run pipeline route')
   // Session turn interceptor: route turn to real aggregator model & stream MoA synthesis
   const moaPendingTurns = new WeakMap()
   const moaSessionTurns = new Map()