@goodandready/dsh-moa 0.2.48 → 0.2.50

package/lib/history.js

@@ -51,6 +51,14 @@ export function invalidateHistoryCache() {
   _historyCache = null
 }
 
+function getOrInitCache(filePath, stat) {
+  if (!_historyCache || _historyCache.filePath !== filePath || _historyCache.mtimeMs !== stat.mtimeMs || _historyCache.size !== stat.size) {
+    _historyCache = { filePath, mtimeMs: stat.mtimeMs, size: stat.size, leaderboards: new Map(), runsById: new Map(), totalCount: null, fullyIndexed: false }
+  }
+  if (!_historyCache.runsById) _historyCache.runsById = new Map()
+  return _historyCache
+}
+
 /**
  * Checks if the history file exceeds the size threshold and rotates it.
  * Moves current file to `${filePath}.1`, removing any older `.1` backup.
@@ -277,22 +285,8 @@ export function countFileLinesSync(filePath, stat) {
     try { fs.closeSync(fd) } catch { /* best effort */ }
   }
 
-  if (
-    !_historyCache ||
-    _historyCache.filePath !== filePath ||
-    _historyCache.mtimeMs !== stat.mtimeMs ||
-    _historyCache.size !== stat.size
-  ) {
-    _historyCache = {
-      filePath,
-      mtimeMs: stat.mtimeMs,
-      size: stat.size,
-      leaderboards: new Map(),
-      totalCount: count,
-    }
-  } else {
-    _historyCache.totalCount = count
-  }
+  const cache = getOrInitCache(filePath, stat)
+  cache.totalCount = count
   return count
 }
 
@@ -314,29 +308,17 @@ export function getMoaHistory(limit = 20, offset = 0, filePath = getDefaultHisto
       const lines = raw.trim().split('\n').filter(Boolean)
       const total = lines.length
 
-      if (
-        !_historyCache ||
-        _historyCache.filePath !== filePath ||
-        _historyCache.mtimeMs !== stat.mtimeMs ||
-        _historyCache.size !== stat.size
-      ) {
-        _historyCache = {
-          filePath,
-          mtimeMs: stat.mtimeMs,
-          size: stat.size,
-          leaderboards: new Map(),
-          totalCount: total,
-        }
-      } else {
-        _historyCache.totalCount = total
-      }
+      const cache = getOrInitCache(filePath, stat)
+      cache.totalCount = total
 
       const sliced = lines
         .slice(Math.max(0, total - offset - limit), total - offset)
         .reverse()
         .map((line) => {
           try {
-            return JSON.parse(line)
+            const item = JSON.parse(line)
+            if (item?.id) cache.runsById.set(item.id, item)
+            return item
           } catch {
             return null
           }
@@ -348,24 +330,22 @@ export function getMoaHistory(limit = 20, offset = 0, filePath = getDefaultHisto
 
     // For larger files: read only tail lines backwards to avoid splitting 10MB in memory
     const tailLines = readTailLinesSync(filePath, needed)
+    const cache = getOrInitCache(filePath, stat)
     const pageLines = tailLines.slice(offset, offset + limit)
     const runs = pageLines
       .map((line) => {
         try {
-          return JSON.parse(line)
+          const item = JSON.parse(line)
+          if (item?.id) cache.runsById.set(item.id, item)
+          return item
         } catch {
           return null
         }
       })
       .filter(Boolean)
 
-    let total = (_historyCache &&
-      _historyCache.filePath === filePath &&
-      _historyCache.mtimeMs === stat.mtimeMs &&
-      _historyCache.size === stat.size &&
-      typeof _historyCache.totalCount === 'number')
-        ? _historyCache.totalCount
-        : undefined
+    const isCached = _historyCache && _historyCache.filePath === filePath && _historyCache.mtimeMs === stat.mtimeMs && _historyCache.size === stat.size
+    let total = isCached && typeof _historyCache.totalCount === 'number' ? _historyCache.totalCount : undefined
     if (typeof total !== 'number') {
       total = tailLines.length < needed ? tailLines.length : countFileLinesSync(filePath, stat)
     }
@@ -392,24 +372,9 @@ export function getMoaLeaderboard(filePath = getDefaultHistoryFile(), options =
     const presetFilter = typeof options === 'string' ? options : (options?.presetFilter || options?.preset || null)
     const filterKey = presetFilter || 'all'
 
-    if (
-      _historyCache &&
-      _historyCache.filePath === filePath &&
-      _historyCache.mtimeMs === stat.mtimeMs &&
-      _historyCache.size === stat.size
-    ) {
-      if (_historyCache.leaderboards.has(filterKey)) {
-        return _historyCache.leaderboards.get(filterKey)
-      }
-    } else {
-      _historyCache = {
-        filePath,
-        mtimeMs: stat.mtimeMs,
-        size: stat.size,
-        leaderboards: new Map(),
-        totalCount: null,
-      }
-    }
+    const isCached = _historyCache && _historyCache.filePath === filePath && _historyCache.mtimeMs === stat.mtimeMs && _historyCache.size === stat.size
+    if (isCached && _historyCache.leaderboards.has(filterKey)) return _historyCache.leaderboards.get(filterKey)
+    const cache = getOrInitCache(filePath, stat)
 
     const raw = fs.readFileSync(filePath, 'utf8')
     const lines = raw.trim().split('\n').filter(Boolean)
@@ -500,19 +465,53 @@ export function getMoaLeaderboard(filePath = getDefaultHistoryFile(), options =
 }
 
 /**
- * Retrieves a single history run by ID.
+ * Retrieves a single history run by ID using in-memory cache and tail reading (#235).
  */
 export function getMoaRunById(runId, filePath = getDefaultHistoryFile()) {
   try {
-    if (!fs.existsSync(filePath)) return null
+    if (!runId || !fs.existsSync(filePath)) return null
+    const stat = fs.statSync(filePath)
+    const cache = getOrInitCache(filePath, stat)
+    if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+    if (cache.fullyIndexed) return null
+
+    if (stat.size <= 65536) {
+      const raw = fs.readFileSync(filePath, 'utf8')
+      const lines = raw.trim().split(String.fromCharCode(10)).filter(Boolean)
+      for (let i = lines.length - 1; i >= 0; i--) {
+        try {
+          const item = JSON.parse(lines[i])
+          if (item?.id) cache.runsById.set(item.id, item)
+        } catch { /* skip corrupt */ }
+      }
+      cache.fullyIndexed = true
+      if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+      cache.runsById.set(runId, null)
+      return null
+    }
+
+    const tailLines = readTailLinesSync(filePath, 100)
+    for (const line of tailLines) {
+      try {
+        const item = JSON.parse(line)
+        if (item?.id) {
+          cache.runsById.set(item.id, item)
+          if (item.id === runId) return item
+        }
+      } catch { /* skip corrupt */ }
+    }
+
     const raw = fs.readFileSync(filePath, 'utf8')
-    const lines = raw.trim().split('\n').filter(Boolean)
+    const lines = raw.trim().split(String.fromCharCode(10)).filter(Boolean)
     for (let i = lines.length - 1; i >= 0; i--) {
       try {
         const item = JSON.parse(lines[i])
-        if (item && item.id === runId) return item
-      } catch { /* corrupt line skipped */ }
+        if (item?.id) cache.runsById.set(item.id, item)
+      } catch { /* skip corrupt */ }
     }
+    cache.fullyIndexed = true
+    if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+    cache.runsById.set(runId, null)
     return null
   } catch {
     return null

package/lib/moa-runner.js

@@ -48,7 +48,7 @@ export async function runMoAPipeline({
   const aggTemp = typeof preset?.aggregator_temperature === 'number' ? preset.aggregator_temperature : 0.4
   const maxTokens = typeof preset?.max_tokens === 'number' ? preset.max_tokens : 4096
   const judgeCriteria = preset?.judge_criteria || ''
-  const isFastMode = referenceModels.length === 1 && !preset?.curator_synthesis
+  let isFastMode = referenceModels.length === 1 && !preset?.curator_synthesis
   const isCuratorSynthesis = Boolean(preset?.curator_synthesis), isStreamAggregator = preset?.stream_aggregator !== false
   const isQuorumEnabled = Boolean(preset?.quorum_enabled), gracePeriodSec = typeof preset?.grace_period_sec === 'number' ? preset.grace_period_sec : 10
   const candidateRetries = 1, refTimeoutSec = typeof preset?.reference_timeout_sec === 'number' ? preset.reference_timeout_sec : 60
@@ -93,6 +93,9 @@ export async function runMoAPipeline({
     return createBudgetAbortPayload({ reason: budgetCheck.reason, primaryJudge, referenceOutputs: [], currentSpentUsd: 0, preset, isRefinement, isFastMode, collectedCtx, startTime })
   }
   const effectiveReferences = budgetCheck.references
+  if (effectiveReferences.length === 1 && !preset?.curator_synthesis) {
+    isFastMode = true
+  }
   if (budgetCheck.action === 'trim' && typeof onProgress === 'function') {
     onProgress(`✂️ *${budgetCheck.reason}*\n`)
   }

package/lib/moa-test-gate.js

@@ -45,21 +45,12 @@ export function resolveCandidateDir(baseDir, candidateIndex, options = {}) {
 
 export function decodeEscapedStrings(str) {
   if (!str || typeof str !== 'string') return ''
-  let res = str.replace(/\\+/g, '\\').replace(/\\(?:([0-7]{1,3})|x([0-9a-fA-F]{2}))/g, (m, oct, hex) =>
+  return str.replace(/\\+/g, '\\').replace(/\\(?:([0-7]{1,3})|x([0-9a-fA-F]{2}))/g, (m, oct, hex) =>
     oct ? String.fromCharCode(parseInt(oct, 8)) : hex ? String.fromCharCode(parseInt(hex, 16)) : m
   )
-  return res.replace(/(?<![A-Za-z0-9+/=])(?:(?:[A-Za-z0-9+/]{4}){2,}|(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=))(?![A-Za-z0-9+/=])/g, (m) => {
-    try {
-      const dec = Buffer.from(m, 'base64').toString('utf8')
-      return /^[\x20-\x7E\r\n\t]+$/.test(dec) ? dec : m
-    } catch (err) {
-      logger.debug('[dsh-moa:testGate] base64 decode skip:', err?.message || err)
-      return m
-    }
-  })
 }
 
-const COMPUTED_SHELL_EVASION = /(?:base64\s+(?:-d|--decode|-D)[^|\n;]*\|\s*(?:ba|z|da)?sh|\beval\s+["\']?\$|\bxxd\s+-r[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+[^|\n]+\|\s*(?:ba|z|da)?sh|\bopenssl\s+enc\s+-d[^|\n;]*\|\s*(?:ba|z|da)?sh)/i
+const COMPUTED_SHELL_EVASION = /(?:base64\s+(?:-d|--decode|-D)[^|\n;]*\|\s*(?:ba|z|da)?sh|\beval\s+["']?\$|\bxxd\s+-r[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+[^|\n]+\|\s*(?:ba|z|da)?sh|\bopenssl\s+enc\s+-d[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+(?:%s|["']%s["'])\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\$\(\s*(?:printf|echo)\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\x60\s*(?:printf|echo)\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\b(?:cat|head|tail|source|\.|touch|rm|cp|mv)\s+["']?\$[A-Za-z_]|>\s*["']?\$[A-Za-z_]|>>\s*["']?\$[A-Za-z_])/i
 
 const UNIX_ROOT_PREFIX = /^\/(?:home|root|etc|var|tmp|opt|mnt|srv|media|proc|sys|dev|usr|bin|lib|lib64|run\/(?:user\/\d+|systemd|lock|credentials|secrets|udev|initramfs|mount|shm|dbus|sshd|motd)|sbin|boot|Users\/(?:[a-zA-Z0-9_\-.]+)|Applications|Library|System|Volumes|private)(?:\/|$)/
 
@@ -82,6 +73,12 @@ function scanPathTokensForLeak(text, allowedRoots, executionDir) {
   }
   const rawLeak = checkText(text)
   if (rawLeak) return rawLeak
+  const segmented = text.match(/\bprintf\s+(?:%s|['"]%s['"])\s+((?:['"][^'"]*['"]\s*)+)/i)
+  if (segmented) {
+    const assembled = (segmented[1].match(/['"]([^'"]*)['"]/g) || []).map((s) => s.slice(1, -1)).join('')
+    const assembledLeak = checkText(assembled)
+    if (assembledLeak) return assembledLeak
+  }
   const decoded = decodeEscapedStrings(text)
   return decoded !== text ? checkText(decoded) : null
 }
@@ -166,6 +163,18 @@ export async function runCandidateTestGate({
       stderr = customRes?.stderr || ''
     } else {
       const allowedRoots = [executionDir, cwd, ...(candidateDir && candidateDir !== executionDir ? [candidateDir] : [])]
+      if (COMPUTED_SHELL_EVASION.test(resolvedCmd)) {
+        const durationMs = Date.now() - startTime
+        return {
+          candidateIndex,
+          passed: false,
+          exitCode: 1,
+          durationMs,
+          command: resolvedCmd,
+          output: 'Access denied: test command contains obfuscated or computed command execution',
+          summary: `FAIL (code 1, ${durationMs}ms)`,
+        }
+      }
       const cmdTokens = resolvedCmd.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) || []
 
       // 1. Check command tokens for absolute path leaks
@@ -310,7 +319,7 @@ function decodeEscaped(str) {
     return m;
   });
 }
-const COMPUTED_SHELL_EVASION = /(?:base64\\s+(?:-d|--decode|-D)[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\beval\\s+["\']?\\$|\\bxxd\\s+-r[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+[^|\\n]+\\|\\s*(?:ba|z|da)?sh|\\bopenssl\\s+enc\\s+-d[^|\\n;]*\\|\\s*(?:ba|z|da)?sh)/i;
+const COMPUTED_SHELL_EVASION = /(?:base64\\s+(?:-d|--decode|-D)[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\beval\\s+["']?\\$|\\bxxd\\s+-r[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+[^|\\n]+\\|\\s*(?:ba|z|da)?sh|\\bopenssl\\s+enc\\s+-d[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+(?:%s|["']%s["'])\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\$\\(\\s*(?:printf|echo)\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\x60\\s*(?:printf|echo)\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\b(?:cat|head|tail|source|\\.|touch|rm|cp|mv)\\s+["']?\\$[A-Za-z_]|>\\s*["']?\\$[A-Za-z_]|>>\\s*["']?\\$[A-Za-z_])/i;
 const UNIX_ROOT_PREFIX = /^\\/(?:home|root|etc|var|tmp|opt|mnt|srv|media|proc|sys|dev|usr|bin|lib|lib64|run\\/(?:user\\/\\d+|systemd|lock|credentials|secrets|udev|initramfs|mount|shm|dbus|sshd|motd)|sbin|boot|Users\\/(?:[a-zA-Z0-9_\\-.]+)|Applications|Library|System|Volumes|private)(?:\\/|$)/;
 function checkSinglePath(p) {
   if (!p || typeof p !== 'string') return true;
@@ -355,36 +364,12 @@ function guardArgs(cmd, args) {
     }
   }
 }
-const origSpawn = cp.spawn;
-cp.spawn = function(cmd, args, opts) {
-  guardArgs(cmd, args);
-  return origSpawn.apply(this, arguments);
-};
-const origSpawnSync = cp.spawnSync;
-cp.spawnSync = function(cmd, args, opts) {
-  guardArgs(cmd, args);
-  return origSpawnSync.apply(this, arguments);
-};
-const origExecFile = cp.execFile;
-cp.execFile = function(file, args, opts, cb) {
-  guardArgs(file, args);
-  return origExecFile.apply(this, arguments);
-};
-const origExecFileSync = cp.execFileSync;
-cp.execFileSync = function(file, args, opts) {
-  guardArgs(file, args);
-  return origExecFileSync.apply(this, arguments);
-};
-const origExec = cp.exec;
-cp.exec = function(cmd, opts, cb) {
-  guardArgs(cmd, [cmd]);
-  return origExec.apply(this, arguments);
-};
-const origExecSync = cp.execSync;
-cp.execSync = function(cmd, opts) {
-  guardArgs(cmd, [cmd]);
-  return origExecSync.apply(this, arguments);
-};
+const origSpawn = cp.spawn; cp.spawn = function(cmd, args, opts) { guardArgs(cmd, args); return origSpawn.apply(this, arguments); };
+const origSpawnSync = cp.spawnSync; cp.spawnSync = function(cmd, args, opts) { guardArgs(cmd, args); return origSpawnSync.apply(this, arguments); };
+const origExecFile = cp.execFile; cp.execFile = function(file, args, opts, cb) { guardArgs(file, args); return origExecFile.apply(this, arguments); };
+const origExecFileSync = cp.execFileSync; cp.execFileSync = function(file, args, opts) { guardArgs(file, args); return origExecFileSync.apply(this, arguments); };
+const origExec = cp.exec; cp.exec = function(cmd, opts, cb) { guardArgs(cmd, [cmd]); return origExec.apply(this, arguments); };
+const origExecSync = cp.execSync; cp.execSync = function(cmd, opts) { guardArgs(cmd, [cmd]); return origExecSync.apply(this, arguments); };
 const fsMod = require('node:fs');
 function guardFs(p, isWrite) {
   if (!p || typeof p !== 'string') return;

package/lib/routes.js

@@ -512,7 +512,6 @@ ctx.effect(() => {
           writeJson(res, 429, { ok: false, error: 'Rate limit exceeded: please wait before starting another run' })
           return
         }
-        _lastRunTimestamp = now
 
         try {
           const raw = await readBody(req)
@@ -522,6 +521,7 @@ ctx.effect(() => {
             writeJson(res, 400, { ok: false, error: 'Empty prompt' })
             return
           }
+          _lastRunTimestamp = now
 
           const cfg = live()
           if (cfg.enabled === false) {

package/lib/updater.js

@@ -41,10 +41,11 @@ export function isTrustedUpdateRequest(request) {
   }
 }
 
-/** General safe write check for plugin write endpoints (CSRF / Cross-Site protection) */
+/** General safe write check for plugin write endpoints (CSRF / Cross-Site protection, #234) */
 export function isSafeWriteRequest(request) {
   const remote = request?.socket?.remoteAddress || request?.connection?.remoteAddress;
   const isLoop = !remote || isLoopback(remote);
+  if (!isLoop) return false;
 
   const site = header(request, 'sec-fetch-site');
   if (site === 'cross-site') return false;
@@ -52,13 +53,6 @@ export function isSafeWriteRequest(request) {
   const origin = header(request, 'origin');
   const host = header(request, 'host');
 
-  // If non-loopback caller, require valid same-origin browser proof
-  if (!isLoop) {
-    if (!origin || !host) return false;
-    if (site && site !== 'same-origin' && site !== 'none') return false;
-  }
-
-  // Same-site without matching origin is rejected regardless of remote
   if (site === 'same-site') {
     if (!origin || !host) return false;
   }
@@ -68,9 +62,7 @@ export function isSafeWriteRequest(request) {
     try {
       const url = new URL(origin);
       if (host && url.host !== host) return false;
-      if (!isLoop) {
-        if (url.protocol !== 'http:' && url.protocol !== 'https:') return false;
-      }
+      if (url.protocol !== 'http:' && url.protocol !== 'https:') return false;
     } catch {
       return false;
     }

package/package.json

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