@quilltap/plugin-utils 2.3.0 → 2.5.0

package/dist/index.mjs

@@ -367,6 +367,21 @@ function applyProfileParameters(body, params, allowlist, normalize) {
   }
 }
 
+// src/providers/system-messages.ts
+function collapseLeadingSystemMessages(messages) {
+  let runLength = 0;
+  while (runLength < messages.length && messages[runLength].role === "system") {
+    runLength++;
+  }
+  if (runLength < 2) return messages;
+  const run = messages.slice(0, runLength);
+  const merged = {
+    ...run[0],
+    content: run.map((m) => m.content ?? "").filter((c) => c.length > 0).join("\n\n")
+  };
+  return [merged, ...messages.slice(runLength)];
+}
+
 // src/providers/openai-compatible.ts
 var DEFAULT_MAX_RETRIES = 2;
 var OpenAICompatibleProvider = class {
@@ -382,6 +397,18 @@ var OpenAICompatibleProvider = class {
     this.supportedMimeTypes = [];
     /** Web search is not supported */
     this.supportsWebSearch = false;
+    /**
+     * Whether the endpoint tolerates more than one leading `system` message.
+     *
+     * True for every hosted service — and so the default, which keeps the
+     * outbound bytes of OpenRouter, Z.AI and every other subclass exactly as they
+     * were. A subclass that points at a local runtime applying the *model's* chat
+     * template sets this false: several template families reject a system message
+     * anywhere but index 0, and Quilltap's context builder deliberately emits up
+     * to three of them so its cache breakpoints survive. See Bug 82 and
+     * {@link collapseLeadingSystemMessages}.
+     */
+    this.acceptsRepeatedSystemMessages = true;
     /**
      * Profile-parameter keys this provider forwards from
      * `LLMParams.profileParameters` onto the request body.
@@ -409,6 +436,14 @@ var OpenAICompatibleProvider = class {
     }
     this.logger = createPluginLogger(`${this.providerName}Provider`);
   }
+  /**
+   * Apply {@link acceptsRepeatedSystemMessages} to a mapped wire-message array.
+   * Called by both body builds so the streaming and non-streaming shapes cannot
+   * drift apart.
+   */
+  applySystemMessagePolicy(messages) {
+    return this.acceptsRepeatedSystemMessages ? messages : collapseLeadingSystemMessages(messages);
+  }
   /**
    * Collects attachment failures for messages with attachments.
    * Since attachments are not supported, all attachments are marked as failed.
@@ -527,17 +562,22 @@ var OpenAICompatibleProvider = class {
     return out;
   }
   /**
-   * Sends a message and returns the complete response.
+   * Build the Chat Completions request body — the ONE build both
+   * {@link sendMessage} and {@link streamMessage} call, so the streaming and
+   * non-streaming shapes cannot drift apart. Maps Quilltap messages to the
+   * OpenAI wire format (tool results and assistant tool calls included),
+   * applies {@link applySystemMessagePolicy}, assembles the body literal, and
+   * finishes with {@link applyProfileParams}.
    *
-   * @param params - LLM parameters including messages, model, and settings
-   * @param apiKey - API key for authentication
-   * @returns Complete LLM response with content and usage statistics
+   * Subclasses that keep the base class's send/stream loops can override this
+   * to reshape the body in one place.
+   *
+   * @param params - LLM parameters for the request
+   * @param stream - Whether the body is for a streaming request; adds
+   *   `stream: true` and `stream_options: { include_usage: true }`
    */
-  async sendMessage(params, apiKey) {
-    this.validateApiKeyRequirement(apiKey);
-    const attachmentResults = this.collectAttachmentFailures(params);
-    const client = this.createClient(apiKey);
-    const messages = params.messages.filter((m) => {
+  buildRequestBody(params, stream) {
+    const mappedMessages = params.messages.filter((m) => {
       if (m.role === "tool" && !m.toolCallId) return false;
       return true;
     }).map((m) => {
@@ -564,6 +604,7 @@ var OpenAICompatibleProvider = class {
         content: m.content
       };
     });
+    const messages = this.applySystemMessagePolicy(mappedMessages);
     const body = {
       model: params.model,
       messages,
@@ -571,12 +612,30 @@ var OpenAICompatibleProvider = class {
       max_tokens: params.maxTokens ?? 4096,
       top_p: params.topP ?? 1,
       stop: params.stop,
+      // Spread here — not appended after the literal — so the streaming keys
+      // keep their historical position between `stop` and `user` and the
+      // serialized body stays byte-identical.
+      ...stream ? { stream: true, stream_options: { include_usage: true } } : {},
       ...params.cacheKey ? { user: params.cacheKey } : {},
       // Tools arrive only once the runtime gate (the profile's "Allow tool
       // use") has passed, so no separate guard is needed here.
       ...params.tools && params.tools.length > 0 ? { tools: params.tools, tool_choice: params.toolChoice ?? "auto" } : {}
     };
     this.applyProfileParams(body, params);
+    return body;
+  }
+  /**
+   * Sends a message and returns the complete response.
+   *
+   * @param params - LLM parameters including messages, model, and settings
+   * @param apiKey - API key for authentication
+   * @returns Complete LLM response with content and usage statistics
+   */
+  async sendMessage(params, apiKey) {
+    this.validateApiKeyRequirement(apiKey);
+    const attachmentResults = this.collectAttachmentFailures(params);
+    const client = this.createClient(apiKey);
+    const body = this.buildRequestBody(params, false);
     try {
       const response = await client.chat.completions.create(
         body,
@@ -616,46 +675,7 @@ var OpenAICompatibleProvider = class {
     this.validateApiKeyRequirement(apiKey);
     const attachmentResults = this.collectAttachmentFailures(params);
     const client = this.createClient(apiKey);
-    const messages = params.messages.filter((m) => {
-      if (m.role === "tool" && !m.toolCallId) return false;
-      return true;
-    }).map((m) => {
-      if (m.role === "tool" && m.toolCallId) {
-        return {
-          role: "tool",
-          tool_call_id: m.toolCallId,
-          content: m.content
-        };
-      }
-      if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0) {
-        return {
-          role: "assistant",
-          content: m.content || null,
-          tool_calls: m.toolCalls.map((tc) => ({
-            id: tc.id,
-            type: tc.type,
-            function: tc.function
-          }))
-        };
-      }
-      return {
-        role: m.role,
-        content: m.content
-      };
-    });
-    const body = {
-      model: params.model,
-      messages,
-      temperature: params.temperature ?? 0.7,
-      max_tokens: params.maxTokens ?? 4096,
-      top_p: params.topP ?? 1,
-      stop: params.stop,
-      stream: true,
-      stream_options: { include_usage: true },
-      ...params.cacheKey ? { user: params.cacheKey } : {},
-      ...params.tools && params.tools.length > 0 ? { tools: params.tools, tool_choice: params.toolChoice ?? "auto" } : {}
-    };
-    this.applyProfileParams(body, params);
+    const body = this.buildRequestBody(params, true);
     try {
       const stream = await client.chat.completions.create(
         body,
@@ -1024,7 +1044,7 @@ function rewriteLocalhostUrl(url) {
 }
 
 // src/version.generated.ts
-var PLUGIN_UTILS_VERSION = "2.3.0";
+var PLUGIN_UTILS_VERSION = "2.5.0";
 export {
   BUILTIN_TOOL_NAMES,
   DEFAULT_REQUEST_TIMEOUT_MS,
@@ -1039,6 +1059,7 @@ export {
   buildRequestAbortSignal,
   buildSdkClientOptions,
   buildSdkRequestOptions,
+  collapseLeadingSystemMessages,
   convertFromAnthropicFormat,
   convertFromGoogleFormat,
   convertOpenAIToAnthropicFormat,