@goodandready/dsh-moa 0.2.57 → 0.2.58

package/lib/moa-llm.js

@@ -21,6 +21,41 @@ function combineSignals(signal, timeoutSignal) {
   return combinedCtrl.signal
 }
 
+/**
+ * Normalizes message content into an array of content blocks ({ type: 'text', text: ... })
+ * required by DSH 0.2.x LLM adapters (e.g. adapters executing message.content.some(...)).
+ */
+export function toContentBlocks(content) {
+  if (Array.isArray(content)) return content
+  if (typeof content === 'string') {
+    return content.length === 0 ? [] : [{ type: 'text', text: content }]
+  }
+  if (content && typeof content === 'object') {
+    const text = typeof content.text === 'string'
+      ? content.text
+      : (typeof content.content === 'string' ? content.content : undefined)
+    if (text !== undefined) {
+      return text.length === 0 ? [] : [{ type: 'text', text }]
+    }
+  }
+  if (content === null || content === undefined) return []
+  return [{ type: 'text', text: String(content) }]
+}
+
+/**
+ * Normalizes an array of messages to guarantee that each message has a role
+ * and its content is an array of content blocks.
+ */
+export function toLlmMessages(messages) {
+  return (Array.isArray(messages) ? messages : [])
+    .filter((m) => m && typeof m === 'object' && typeof m.role === 'string')
+    .map((m) => ({
+      ...m,
+      role: m.role,
+      content: toContentBlocks(m.content),
+    }))
+}
+
 /**
  * Unified LLM Dispatcher using ctx.llm.prepareCall / stream
  */
@@ -70,10 +105,11 @@ export function createLlmCaller(ctx) {
     const combinedSignal = combineSignals(signal, abortCtrl.signal)
 
     try {
+      const normalizedMessages = toLlmMessages(messages)
       const streamConfig = prep.config || callConfig
       const stream = prep.stream({
         ...streamConfig,
-        messages,
+        messages: normalizedMessages,
         temperature: streamConfig.temperature ?? temperature,
         maxTokens: streamConfig.maxTokens ?? maxTokens,
         signal: combinedSignal,
@@ -129,7 +165,7 @@ export function createLlmCaller(ctx) {
         content: fullText,
         text: fullText,
         usage: usageInfo || {
-          inputTokens: Math.round(JSON.stringify(messages).length / 4),
+          inputTokens: Math.round(JSON.stringify(normalizedMessages).length / 4),
           outputTokens: Math.round(fullText.length / 4),
         },
       }

package/package.json

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