@quilltap/plugin-utils 2.4.0 → 2.6.0

package/dist/index.mjs

@@ -562,16 +562,21 @@ 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);
+  buildRequestBody(params, stream) {
     const mappedMessages = params.messages.filter((m) => {
       if (m.role === "tool" && !m.toolCallId) return false;
       return true;
@@ -607,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,
@@ -652,47 +675,7 @@ var OpenAICompatibleProvider = class {
     this.validateApiKeyRequirement(apiKey);
     const attachmentResults = this.collectAttachmentFailures(params);
     const client = this.createClient(apiKey);
-    const mappedMessages = 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 messages = this.applySystemMessagePolicy(mappedMessages);
-    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,
@@ -929,7 +912,7 @@ function getBuiltinToolNames() {
 }
 
 // src/host-rewrite.ts
-import { readFileSync, existsSync, statSync } from "fs";
+import { existsSync, statSync } from "fs";
 var LOCALHOST_HOSTS = /* @__PURE__ */ new Set([
   "localhost",
   "127.0.0.1",
@@ -938,9 +921,6 @@ var LOCALHOST_HOSTS = /* @__PURE__ */ new Set([
 ]);
 var cachedGatewayHost;
 var rewriteLogger = createPluginLogger("host-rewrite");
-function isLimaEnvironment() {
-  return process.env.LIMA_CONTAINER === "true";
-}
 function isDockerEnvironment() {
   if (process.env.DOCKER_CONTAINER === "true") {
     return true;
@@ -958,7 +938,7 @@ function isDockerEnvironment() {
   return false;
 }
 function isVMEnvironment() {
-  return isDockerEnvironment() || isLimaEnvironment();
+  return isDockerEnvironment() || !!process.env.QUILLTAP_HOST_IP;
 }
 function resolveHostGateway() {
   if (cachedGatewayHost !== void 0) {
@@ -970,65 +950,11 @@ function resolveHostGateway() {
     cachedGatewayHost = envIP;
     return cachedGatewayHost;
   }
-  if (isDockerEnvironment() && !isLimaEnvironment()) {
+  if (isDockerEnvironment()) {
     rewriteLogger.info("Docker environment detected \u2014 using host.docker.internal as gateway hostname");
     cachedGatewayHost = "host.docker.internal";
     return cachedGatewayHost;
   }
-  try {
-    if (existsSync("/proc/sys/fs/binfmt_misc/WSLInterop")) {
-      const resolv = readFileSync("/etc/resolv.conf", "utf-8");
-      for (const line of resolv.split("\n")) {
-        const trimmed = line.trim();
-        if (trimmed.startsWith("#") || trimmed === "") continue;
-        const match = trimmed.match(/^nameserver\s+(\S+)/);
-        if (match) {
-          const ip = match[1];
-          rewriteLogger.info("WSL2 host IP from /etc/resolv.conf nameserver", { ip });
-          cachedGatewayHost = ip;
-          return cachedGatewayHost;
-        }
-      }
-    }
-  } catch {
-    rewriteLogger.debug("Could not detect WSL2 or read /etc/resolv.conf");
-  }
-  try {
-    const routeTable = readFileSync("/proc/net/route", "utf-8");
-    for (const line of routeTable.split("\n").slice(1)) {
-      const fields = line.trim().split("	");
-      if (fields.length >= 3 && fields[1] === "00000000") {
-        const hexGateway = fields[2];
-        const ip = [
-          parseInt(hexGateway.substring(6, 8), 16),
-          parseInt(hexGateway.substring(4, 6), 16),
-          parseInt(hexGateway.substring(2, 4), 16),
-          parseInt(hexGateway.substring(0, 2), 16)
-        ].join(".");
-        rewriteLogger.info("Host gateway IP from /proc/net/route", { ip });
-        cachedGatewayHost = ip;
-        return cachedGatewayHost;
-      }
-    }
-  } catch {
-    rewriteLogger.debug("Could not read /proc/net/route for default gateway lookup");
-  }
-  try {
-    const hosts = readFileSync("/etc/hosts", "utf-8");
-    for (const line of hosts.split("\n")) {
-      const trimmed = line.trim();
-      if (trimmed.startsWith("#") || trimmed === "") continue;
-      const parts = trimmed.split(/\s+/);
-      if (parts.length >= 2 && parts.slice(1).includes("host.docker.internal")) {
-        const ip = parts[0];
-        rewriteLogger.info("Host gateway IP from /etc/hosts (host.docker.internal)", { ip });
-        cachedGatewayHost = ip;
-        return cachedGatewayHost;
-      }
-    }
-  } catch {
-    rewriteLogger.debug("Could not read /etc/hosts for host.docker.internal lookup");
-  }
   rewriteLogger.warn("Could not resolve host gateway \u2014 localhost URLs will not be rewritten");
   cachedGatewayHost = null;
   return cachedGatewayHost;
@@ -1061,7 +987,7 @@ function rewriteLocalhostUrl(url) {
 }
 
 // src/version.generated.ts
-var PLUGIN_UTILS_VERSION = "2.4.0";
+var PLUGIN_UTILS_VERSION = "2.6.0";
 export {
   BUILTIN_TOOL_NAMES,
   DEFAULT_REQUEST_TIMEOUT_MS,