@goodandready/dsh-moa 0.2.67 → 0.2.68

package/lib/index.js

@@ -401,3 +401,15 @@ export {
   analyzeCandidateUncertainty,
   formatUncertaintyAnnotations,
 } from './moa-uncertainty.js'
+export {
+  classifyPromptDomain,
+  assignAdaptivePersonas,
+  DOMAIN_PERSONA_POOLS,
+} from './moa-adaptive-personas.js'
+export {
+  isGitRepository,
+  createSwarmWorktree,
+  collectSwarmWorktreeDiff,
+  cleanupSwarmWorktrees,
+  runSubagentSwarm,
+} from './moa-swarm.js'

package/lib/moa-adaptive-personas.js

@@ -0,0 +1,176 @@
+/**
+ * Prompt-Adaptive Dynamic Persona Synthesis for Reference Models (#254)
+ * Classifies prompt technical domain and synthesizes complementary engineering personas
+ * dynamically so each candidate approaches the task from a distinct expert angle.
+ */
+
+export const DOMAIN_PERSONA_POOLS = {
+  database: [
+    {
+      id: 'dba_index_specialist',
+      title: 'DBA Index Specialist',
+      prompt: 'You are a Principal DBA Index Specialist. Focus on query execution plans, composite indexing, lock contention prevention, and optimal read/write throughput.',
+    },
+    {
+      id: 'zero_downtime_migration_guard',
+      title: 'Zero-Downtime Migration Guard',
+      prompt: 'You are a Zero-Downtime Migration Guard. Ensure backward-compatible schema evolutions, safe expand-and-contract patterns, and rollback safety.',
+    },
+    {
+      id: 'orm_query_architect',
+      title: 'ORM & Query Architect',
+      prompt: 'You are an ORM & Query Architect. Focus on eliminating N+1 queries, clean repository abstractions, transaction isolation levels, and strict data integrity.',
+    },
+  ],
+  frontend: [
+    {
+      id: 'a11y_ux_specialist',
+      title: 'Accessibility & UX Specialist',
+      prompt: 'You are an Accessibility & UX Specialist. Ensure WCAG 2.1 AA compliance, keyboard navigation, ARIA semantics, and responsive user feedback.',
+    },
+    {
+      id: 'css_design_systems_architect',
+      title: 'CSS & Design Systems Architect',
+      prompt: 'You are a CSS & Design Systems Architect. Focus on design tokens, layout resilience, fluid typography, zero layout shift, and clean component composition.',
+    },
+    {
+      id: 'state_rendering_optimizer',
+      title: 'State & Rendering Optimizer',
+      prompt: 'You are a Frontend State & Rendering Optimizer. Focus on minimizing unnecessary re-renders, memoization, deterministic state transitions, and bundle efficiency.',
+    },
+  ],
+  security: [
+    {
+      id: 'offensive_security_auditor',
+      title: 'Offensive Security Auditor',
+      prompt: 'You are an Offensive Security Auditor. Proactively hunt for injection vectors, SSRF, path traversal, auth bypass, and privilege escalation.',
+    },
+    {
+      id: 'defensive_hardening_specialist',
+      title: 'Defensive Hardening Specialist',
+      prompt: 'You are a Defensive Hardening Specialist. Enforce least-privilege access, strict input validation, fail-closed guards, and cryptographic best practices.',
+    },
+    {
+      id: 'runtime_sandbox_guardian',
+      title: 'Runtime & Sandbox Guardian',
+      prompt: 'You are a Runtime & Sandbox Guardian. Focus on resource limits, rate limiting, secret sanitization, and zero-trust boundary enforcement.',
+    },
+  ],
+  performance: [
+    {
+      id: 'algorithmic_optimizer',
+      title: 'Algorithmic Complexity Optimizer',
+      prompt: 'You are an Algorithmic Complexity Optimizer. Replace O(N^2) bottlenecks with optimal data structures, streaming pipelines, and bounded memory usage.',
+    },
+    {
+      id: 'concurrency_profiler',
+      title: 'Memory & Concurrency Profiler',
+      prompt: 'You are a Memory & Concurrency Profiler. Prevent event-loop blocking, race conditions, memory leaks, and unbounded promise queues.',
+    },
+  ],
+  testing: [
+    {
+      id: 'edge_case_fuzzer',
+      title: 'Edge-Case & Fuzzing Specialist',
+      prompt: 'You are an Edge-Case & Fuzzing Specialist. Target boundary conditions, malformed inputs, concurrency races, and failure recovery paths.',
+    },
+    {
+      id: 'contract_test_architect',
+      title: 'Integration & Contract Test Architect',
+      prompt: 'You are an Integration & Contract Test Architect. Build deterministic, isolated, fast-running test suites with zero flakiness.',
+    },
+  ],
+  architecture: [
+    {
+      id: 'ddd_architect',
+      title: 'Domain-Driven Design Architect',
+      prompt: 'You are a Domain-Driven Design Architect. Enforce clean module boundaries, single responsibility, explicit contracts, and low coupling.',
+    },
+    {
+      id: 'resilience_engineer',
+      title: 'Resilience & Fault-Tolerance Engineer',
+      prompt: 'You are a Resilience & Fault-Tolerance Engineer. Design idempotent operations, graceful degradation, circuit breakers, and clear error taxonomy.',
+    },
+  ],
+}
+
+const DOMAIN_RULES = [
+  { domain: 'database', pattern: /\b(sql|postgres|mysql|sqlite|prisma|drizzle|typeorm|migration|index|schema|table|query|database|db|transaction)\b/i },
+  { domain: 'security', pattern: /\b(security|auth|jwt|oauth|csrf|xss|ssrf|injection|traversal|permission|encrypt|hash|token|secret|vulnerability|cve)\b/i },
+  { domain: 'frontend', pattern: /\b(react|vue|svelte|css|tailwind|html|dom|component|ui|ux|button|modal|layout|responsive|aria|accessibility|style)\b/i },
+  { domain: 'performance', pattern: /\b(performance|optimize|latency|throughput|cache|memory|leak|benchmark|bottleneck|fast|profil|concurrent|parallel)\b/i },
+  { domain: 'testing', pattern: /\b(test|unit|integration|e2e|mock|assert|coverage|vitest|jest|playwright|tdd|regression)\b/i },
+]
+
+/**
+ * Classifies a user prompt into a specialized technical domain.
+ *
+ * @param {string} prompt
+ * @returns {{ domain: string, confidence: number, matchedKeywords: string[] }}
+ */
+export function classifyPromptDomain(prompt) {
+  const text = String(prompt || '').trim()
+  if (!text) return { domain: 'architecture', confidence: 0.5, matchedKeywords: [] }
+
+  let bestDomain = 'architecture'
+  let bestCount = 0
+  let bestMatches = []
+
+  for (const rule of DOMAIN_RULES) {
+    const matches = [...text.matchAll(new RegExp(rule.pattern.source, 'gi'))].map((m) => m[0].toLowerCase())
+    const unique = [...new Set(matches)]
+    if (unique.length > bestCount) {
+      bestCount = unique.length
+      bestDomain = rule.domain
+      bestMatches = unique
+    }
+  }
+
+  return {
+    domain: bestDomain,
+    confidence: bestCount > 0 ? Math.min(0.98, Number((0.6 + bestCount * 0.12).toFixed(2))) : 0.55,
+    matchedKeywords: bestMatches,
+  }
+}
+
+/**
+ * Synthesizes and assigns complementary domain-specific personas to reference model slots.
+ *
+ * @param {Array<object>} references
+ * @param {string} prompt
+ * @returns {{ domain: string, references: Array<object>, personasAssigned: Array<object> }}
+ */
+export function assignAdaptivePersonas(references, prompt) {
+  if (!Array.isArray(references) || references.length === 0) {
+    return { domain: 'architecture', references: [], personasAssigned: [] }
+  }
+
+  const { domain } = classifyPromptDomain(prompt)
+  const pool = DOMAIN_PERSONA_POOLS[domain] || DOMAIN_PERSONA_POOLS.architecture
+  const fallbackPool = DOMAIN_PERSONA_POOLS.architecture
+
+  const personasAssigned = []
+  const enrichedRefs = references.map((slot, idx) => {
+    const chosen = pool[idx % pool.length] || fallbackPool[idx % fallbackPool.length]
+    personasAssigned.push({
+      candidateIndex: idx + 1,
+      model: `${slot.provider || ''}:${slot.model || ''}`,
+      domain,
+      personaId: chosen.id,
+      personaTitle: chosen.title,
+    })
+    return {
+      ...slot,
+      adaptive_domain: domain,
+      adaptive_persona_id: chosen.id,
+      adaptive_persona_title: chosen.title,
+      adaptive_persona_prompt: `[ADAPTIVE EXPERT ROLE — ${chosen.title} (${domain.toUpperCase()})]: ${chosen.prompt}`,
+    }
+  })
+
+  return {
+    domain,
+    references: enrichedRefs,
+    personasAssigned,
+  }
+}

package/lib/moa-candidates.js

@@ -85,9 +85,9 @@ export async function runReferencesParallel(references, messages, options = {},
   references.forEach((slot, i) => {
     const label = slotLabel(slot)
     const role = slot?.role_persona || slot?.role || 'general'
-    const persona = (role && ROLE_PERSONA_PROMPTS[role])
-      ? `\n\n${ROLE_PERSONA_PROMPTS[role]}`
-      : ''
+    const basePersona = (role && ROLE_PERSONA_PROMPTS[role]) ? `\n\n${ROLE_PERSONA_PROMPTS[role]}` : ''
+    const adaptiveExtra = slot?.adaptive_persona_prompt ? `\n\n${slot.adaptive_persona_prompt}` : ''
+    const persona = basePersona + adaptiveExtra
     const slotMessages = [{ role: 'system', content: systemPrompt + persona }, ...advisoryMessages]
 
     // Feature 7: Per-candidate temperature or temperature gradient
@@ -140,7 +140,8 @@ export async function runReferencesParallel(references, messages, options = {},
           index: i + 1,
           slot,
           label,
-          role_persona: role,
+          role_persona: slot?.adaptive_persona_title || role,
+          ...(slot?.adaptive_domain ? { adaptive_domain: slot.adaptive_domain } : {}),
           temperature: effectiveTemperature,
           text,
           usage: costInfo,

package/lib/moa-parser.js

@@ -56,12 +56,18 @@ export function parseMoACommand(text, presets = [], defaultPreset = undefined) {
     }
   }
 
-  const remainder = text.slice(4).trim()
+  let remainder = text.slice(4).trim()
+  let isSwarm = false
+  if (/^--swarm(?:\s+|$)/i.test(remainder)) {
+    isSwarm = true
+    remainder = remainder.replace(/^--swarm\s*/i, '').trim()
+  }
   if (!remainder) {
     return {
       presetName: defaultPreset,
       prompt: '',
       isExplicit: false,
+      ...(isSwarm ? { isSwarm: true } : {}),
     }
   }
 
@@ -71,6 +77,7 @@ export function parseMoACommand(text, presets = [], defaultPreset = undefined) {
       presetName: matchPreset[1],
       prompt: matchPreset[2] || '',
       isExplicit: true,
+      ...(isSwarm ? { isSwarm: true } : {}),
     }
   }
 
@@ -80,6 +87,7 @@ export function parseMoACommand(text, presets = [], defaultPreset = undefined) {
       presetName: matchShortPreset[1],
       prompt: matchShortPreset[2] || '',
       isExplicit: true,
+      ...(isSwarm ? { isSwarm: true } : {}),
     }
   }
 
@@ -100,6 +108,7 @@ export function parseMoACommand(text, presets = [], defaultPreset = undefined) {
     presetName: defaultPreset,
     prompt: remainder,
     isExplicit: false,
+    ...(isSwarm ? { isSwarm: true } : {}),
   }
 }
 

package/lib/moa-schema.js

@@ -64,6 +64,8 @@ export const PresetSchema = z.object({
   local_fallback_models: z.array(ModelSlotSchema).default([]),
   interactive_workbench_enabled: z.boolean().default(false),
   uncertainty_scoring_enabled: z.boolean().default(false),
+  subagent_swarm_enabled: z.boolean().default(false),
+  adaptive_personas_enabled: z.boolean().default(false),
 })
 
 export const Config = z.object({
@@ -74,6 +76,8 @@ export const Config = z.object({
   ask_clarifying_questions: z.boolean().default(true).volatile(),
   test_gate_enabled: z.boolean().default(false).volatile(),
   uncertainty_scoring_enabled: z.boolean().default(false).volatile(),
+  subagent_swarm_enabled: z.boolean().default(false).volatile(),
+  adaptive_personas_enabled: z.boolean().default(false).volatile(),
   smart_routing_model: ModelSlotSchema.default({ provider: '', model: '' }).volatile(),
   prices: z.dict(PriceRow).default({}).volatile(),
   presets: z.array(PresetSchema).default([

package/lib/moa-swarm.js

@@ -0,0 +1,219 @@
+/**
+ * MoA-to-Subagents Swarm with Isolated Git Worktrees (#255)
+ * Provisions isolated git worktrees (or workspace sandboxes) per candidate,
+ * dispatches autonomous subagent/candidate execution, collects git diffs,
+ * and guarantees worktree cleanup in finally blocks.
+ */
+
+import fs from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import path from 'node:path'
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
+import { logger } from './logger.js'
+import { slotLabel } from './moa-prompts.js'
+import { extractFileBlocks } from './workspace/fs.js'
+
+const execFileAsync = promisify(execFile)
+
+/**
+ * Checks if a directory is inside a valid git repository.
+ */
+export async function isGitRepository(cwd) {
+  try {
+    const { stdout } = await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], { cwd, timeout: 5000 })
+    return stdout.trim() === 'true'
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Creates an isolated git worktree (or directory sandbox if not a git repo) for a swarm candidate.
+ *
+ * @param {string} cwd
+ * @param {string} runId
+ * @param {number} candidateIndex
+ * @returns {Promise<{ worktreePath: string, branchName: string, isGitWorktree: boolean }>}
+ */
+export async function createSwarmWorktree(cwd, runId, candidateIndex) {
+  const safeRunId = String(runId || Date.now()).replace(/[^a-zA-Z0-9_-]/g, '')
+  const worktreePath = path.join(cwd, '.moa', `swarm-${safeRunId}`, `candidate-${candidateIndex}`)
+  const branchName = `moa-swarm/${safeRunId}/cand-${candidateIndex}`
+
+  await fs.mkdir(path.dirname(worktreePath), { recursive: true })
+
+  if (await isGitRepository(cwd)) {
+    try {
+      await execFileAsync('git', ['worktree', 'add', '--detach', worktreePath, 'HEAD'], { cwd, timeout: 10000 })
+      return { worktreePath, branchName, isGitWorktree: true }
+    } catch (err) {
+      logger.warn(`[dsh-moa] git worktree add failed for candidate-${candidateIndex}, using isolated directory sandbox: ${err?.message || err}`)
+    }
+  }
+
+  await fs.mkdir(worktreePath, { recursive: true })
+  return { worktreePath, branchName, isGitWorktree: false }
+}
+
+/**
+ * Collects git diff and modified files from a candidate's swarm worktree.
+ *
+ * @param {string} worktreePath
+ * @param {boolean} isGitWorktree
+ * @returns {Promise<{ diffText: string, modifiedFiles: string[] }>}
+ */
+export async function collectSwarmWorktreeDiff(worktreePath, isGitWorktree = false) {
+  if (!existsSync(worktreePath)) {
+    return { diffText: '', modifiedFiles: [] }
+  }
+
+  if (isGitWorktree) {
+    try {
+      const { stdout: statusOut } = await execFileAsync('git', ['status', '--porcelain'], { cwd: worktreePath, timeout: 5000 })
+      const modifiedFiles = statusOut
+        .split('\n')
+        .map((line) => line.slice(3).trim())
+        .filter(Boolean)
+
+      const { stdout: diffOut } = await execFileAsync('git', ['diff', 'HEAD'], { cwd: worktreePath, timeout: 5000 })
+      return { diffText: diffOut.trim(), modifiedFiles }
+    } catch {
+      // Fallback to directory scan
+    }
+  }
+
+  const modifiedFiles = []
+  async function scanDir(dir, prefix = '') {
+    const entries = await fs.readdir(dir, { withFileTypes: true }).catch(() => [])
+    for (const entry of entries) {
+      if (entry.name === '.git') continue
+      const rel = prefix ? `${prefix}/${entry.name}` : entry.name
+      const full = path.join(dir, entry.name)
+      if (entry.isDirectory()) {
+        await scanDir(full, rel)
+      } else {
+        modifiedFiles.push(rel)
+      }
+    }
+  }
+  await scanDir(worktreePath)
+  return { diffText: '', modifiedFiles }
+}
+
+/**
+ * Guarantees removal of all swarm worktrees and temporary directories.
+ *
+ * @param {string} cwd
+ * @param {string} runId
+ * @param {Array<{ worktreePath: string, isGitWorktree: boolean }>} worktrees
+ */
+export async function cleanupSwarmWorktrees(cwd, runId, worktrees = []) {
+  for (const wt of worktrees) {
+    if (!wt?.worktreePath) continue
+    if (wt.isGitWorktree) {
+      try {
+        await execFileAsync('git', ['worktree', 'remove', '--force', wt.worktreePath], { cwd, timeout: 8000 })
+      } catch {}
+    }
+    try {
+      await fs.rm(wt.worktreePath, { recursive: true, force: true })
+    } catch {}
+  }
+
+  if (await isGitRepository(cwd)) {
+    try {
+      await execFileAsync('git', ['worktree', 'prune'], { cwd, timeout: 5000 })
+    } catch {}
+  }
+
+  const safeRunId = String(runId || '').replace(/[^a-zA-Z0-9_-]/g, '')
+  if (safeRunId) {
+    const swarmRoot = path.join(cwd, '.moa', `swarm-${safeRunId}`)
+    try {
+      await fs.rm(swarmRoot, { recursive: true, force: true })
+    } catch {}
+  }
+}
+
+/**
+ * Runs candidates as a swarm with isolated worktrees.
+ * Uses ctx.subagent.run if available on Cordis context, falling back to callLlm + worktree materialization.
+ */
+export async function runSubagentSwarm(references, messages, options = {}, callLlm, onProgress) {
+  const cwd = options.cwd || process.cwd()
+  const runId = options.runId || `run-${Date.now()}`
+  const worktrees = []
+
+  try {
+    if (typeof onProgress === 'function') {
+      onProgress(`🐝 *Launching MoA Subagent Swarm across ${references.length} isolated worktrees...*\n`)
+    }
+
+    const tasks = references.map(async (slot, idx) => {
+      const candidateIndex = idx + 1
+      const label = slotLabel(slot)
+      const wt = await createSwarmWorktree(cwd, runId, candidateIndex)
+      worktrees.push(wt)
+
+      const start = Date.now()
+      let responseText = ''
+      let usage = { inputTokens: 100, outputTokens: 100, totalTokens: 200, costUsd: 0 }
+
+      if (options.ctx?.subagent && typeof options.ctx.subagent.run === 'function') {
+        const subRes = await options.ctx.subagent.run({
+          provider: slot.provider,
+          model: slot.model,
+          cwd: wt.worktreePath,
+          messages,
+          signal: options.signal,
+        })
+        responseText = typeof subRes === 'string' ? subRes : (subRes?.content || subRes?.text || '')
+        if (subRes?.usage) usage = subRes.usage
+      } else {
+        const llmRes = await callLlm({
+          provider: slot.provider,
+          model: slot.model,
+          messages,
+          temperature: options.temperature ?? 0.6,
+          maxTokens: options.maxTokens ?? 4096,
+          signal: options.signal,
+        })
+        responseText = typeof llmRes === 'string' ? llmRes : (llmRes?.content || llmRes?.text || '')
+        if (llmRes?.usage) usage = llmRes.usage
+      }
+
+      // Materialize any extracted file blocks inside the isolated worktree
+      const files = extractFileBlocks(responseText)
+      for (const f of files) {
+        const targetFile = path.join(wt.worktreePath, f.relativePath || f.path || "")
+        await fs.mkdir(path.dirname(targetFile), { recursive: true })
+        await fs.writeFile(targetFile, f.content, 'utf8')
+      }
+
+      const diffInfo = await collectSwarmWorktreeDiff(wt.worktreePath, wt.isGitWorktree)
+      const enrichedText = diffInfo.diffText
+        ? `${responseText}\n\n#### Git Worktree Diff (${wt.branchName}):\n\`\`\`diff\n${diffInfo.diffText}\n\`\`\``
+        : responseText
+
+      return {
+        index: candidateIndex,
+        slot,
+        label,
+        text: enrichedText,
+        files,
+        swarmWorktree: wt.worktreePath,
+        swarmBranch: wt.branchName,
+        modifiedFiles: diffInfo.modifiedFiles,
+        usage,
+        costUsd: usage.costUsd || 0,
+        durationMs: Date.now() - start,
+        ok: true,
+      }
+    })
+
+    return await Promise.all(tasks)
+  } finally {
+    await cleanupSwarmWorktrees(cwd, runId, worktrees)
+  }
+}

package/lib/pipeline/candidates.js

@@ -1,3 +1,5 @@
+import { assignAdaptivePersonas } from '../moa-adaptive-personas.js'
+import { runSubagentSwarm } from '../moa-swarm.js'
 import { runReferencesParallel } from '../moa-candidates.js'
 import { extractFileBlocks, writeCandidateWorkspace, cleanMoaWorkspaces } from '../workspace/fs.js'
 import { verifyFileSyntax } from '../workspace/diff.js'
@@ -30,8 +32,15 @@ export async function stageCandidateRound1({
   testCommand,
   execFn,
 }) {
-  const referenceOutputs = await runReferencesParallel(
-    effectiveReferences,
+  const lastMsgText = enrichedMessages[enrichedMessages.length - 1]?.content || ''
+  const adaptiveRefs = preset?.adaptive_personas_enabled
+    ? assignAdaptivePersonas(effectiveReferences, typeof lastMsgText === 'string' ? lastMsgText : '').references
+    : effectiveReferences
+
+  const referenceOutputs = preset?.subagent_swarm_enabled
+    ? await runSubagentSwarm(adaptiveRefs, enrichedMessages, { temperature: refTemp, maxTokens, signal, cwd, runId }, callLlm, onProgress)
+    : await runReferencesParallel(
+    adaptiveRefs,
     enrichedMessages,
     {
       systemPrompt: candidateSystemPrompt,

package/package.json

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