open-agents-ai 0.187.520 → 0.187.521

package/dist/index.js

@@ -539,6 +539,89 @@ var init_normalizeUrl = __esm({
   }
 });
 
+// packages/backend-vllm/dist/messageNormalize.js
+function normalizeMessagesForStrictOpenAI(messages2, stats) {
+  if (stats) {
+    stats.inputSystemCount = 0;
+    stats.mergedLeading = 0;
+    stats.convertedToUser = 0;
+    stats.changed = false;
+  }
+  if (!Array.isArray(messages2) || messages2.length === 0)
+    return [];
+  const leading = [];
+  let i2 = 0;
+  while (i2 < messages2.length && messages2[i2].role === "system") {
+    leading.push(messages2[i2]);
+    i2++;
+  }
+  if (stats) {
+    stats.inputSystemCount += leading.length;
+    stats.mergedLeading = leading.length;
+  }
+  const out = [];
+  if (leading.length > 0) {
+    if (leading.length === 1) {
+      out.push(leading[0]);
+    } else {
+      const allStrings = leading.every((m2) => typeof m2.content === "string");
+      if (allStrings) {
+        const merged = leading.map((m2) => m2.content ?? "").filter((s2) => s2.length > 0).join(SYSTEM_MERGE_SEP);
+        out.push({ ...leading[0], content: merged });
+      } else {
+        out.push(leading[0]);
+        for (let k = 1; k < leading.length; k++) {
+          const c9 = leading[k].content;
+          const cs = typeof c9 === "string" ? c9 : "";
+          if (cs.length > 0) {
+            out.push({ ...leading[k], role: "user", content: `${SYSTEM_AS_USER_PREFIX}${cs}` });
+          }
+        }
+      }
+      if (stats)
+        stats.changed = true;
+    }
+  }
+  for (; i2 < messages2.length; i2++) {
+    const m2 = messages2[i2];
+    if (m2.role === "system") {
+      if (stats) {
+        stats.inputSystemCount += 1;
+        stats.convertedToUser += 1;
+        stats.changed = true;
+      }
+      const c9 = m2.content;
+      const cs = typeof c9 === "string" ? c9 : "";
+      if (cs.length > 0) {
+        out.push({ ...m2, role: "user", content: `${SYSTEM_AS_USER_PREFIX}${cs}` });
+      }
+    } else {
+      out.push(m2);
+    }
+  }
+  if (stats && !stats.changed) {
+    if (out.length !== messages2.length)
+      stats.changed = true;
+    else {
+      for (let k = 0; k < out.length; k++) {
+        if (out[k] !== messages2[k]) {
+          stats.changed = true;
+          break;
+        }
+      }
+    }
+  }
+  return out;
+}
+var SYSTEM_MERGE_SEP, SYSTEM_AS_USER_PREFIX;
+var init_messageNormalize = __esm({
+  "packages/backend-vllm/dist/messageNormalize.js"() {
+    "use strict";
+    SYSTEM_MERGE_SEP = "\n\n---\n\n";
+    SYSTEM_AS_USER_PREFIX = "[SYSTEM]: ";
+  }
+});
+
 // packages/backend-vllm/dist/VllmBackend.js
 function agentMessageToChatMessage(msg) {
   return {
@@ -555,6 +638,7 @@ var init_VllmBackend = __esm({
     "use strict";
     init_sleep();
     init_normalizeUrl();
+    init_messageNormalize();
     VllmBackend = class {
       baseUrl;
       model;
@@ -594,7 +678,8 @@ var init_VllmBackend = __esm({
       // LLMBackend — complete
       // -------------------------------------------------------------------------
       async complete(request) {
-        const messages2 = request.messages.map(agentMessageToChatMessage);
+        const rawMessages = request.messages.map(agentMessageToChatMessage);
+        const messages2 = normalizeMessagesForStrictOpenAI(rawMessages);
         const body = {
           model: this.model,
           messages: messages2,
@@ -709,6 +794,7 @@ var init_OllamaBackend = __esm({
   "packages/backend-vllm/dist/OllamaBackend.js"() {
     "use strict";
     init_normalizeUrl();
+    init_messageNormalize();
     OllamaBackend = class _OllamaBackend {
       baseUrl;
       model;
@@ -744,7 +830,7 @@ var init_OllamaBackend = __esm({
       // LLMBackend — complete
       // -------------------------------------------------------------------------
       async complete(request) {
-        const messages2 = request.messages.map(agentMessageToChatMessage2);
+        const messages2 = normalizeMessagesForStrictOpenAI(request.messages.map(agentMessageToChatMessage2));
         const body = {
           model: this.model,
           messages: messages2,
@@ -1140,6 +1226,7 @@ var init_dist = __esm({
     init_sleep();
     init_routing();
     init_normalizeUrl();
+    init_messageNormalize();
   }
 });
 
@@ -535544,7 +535631,7 @@ ${description}`
         if (this._isAnthropic) {
           return this._anthropicChatCompletion(request);
         }
-        const cleanedMessages = sanitizeHistoryThink(request.messages);
+        const cleanedMessages = normalizeMessagesForStrictOpenAI(sanitizeHistoryThink(request.messages));
         const effectiveThink = computeEffectiveThink({
           requestThink: request.think,
           defaultThink: this.thinking,
@@ -535784,7 +535871,7 @@ ${description}`
        * The existing chatCompletion() method is completely unmodified.
        */
       async *chatCompletionStream(request) {
-        const cleanedMessages = request.messages.map((m2) => m2.role === "assistant" && typeof m2.content === "string" ? { ...m2, content: stripThinkBlocks(m2.content) } : m2);
+        const cleanedMessages = normalizeMessagesForStrictOpenAI(request.messages.map((m2) => m2.role === "assistant" && typeof m2.content === "string" ? { ...m2, content: stripThinkBlocks(m2.content) } : m2));
         const effectiveThink = computeEffectiveThink({
           requestThink: request.think,
           defaultThink: this.thinking,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.520",
+  "version": "0.187.521",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "open-agents-ai",
-      "version": "0.187.520",
+      "version": "0.187.521",
       "hasInstallScript": true,
       "license": "CC-BY-NC-4.0",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.520",
+  "version": "0.187.521",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",