deepcode-ai 1.1.38 → 1.1.39

package/dist/index.js

@@ -6096,7 +6096,8 @@ var OpenAICompatibleProvider = class {
     await this.assertOk(response);
     const pendingTools = /* @__PURE__ */ new Map();
     let lastUsage = null;
-    let contentToolBuffer = null;
+    const bufferAllContent = Boolean(this.contentToolCallParser);
+    let bufferedContent = "";
     for await (const event of parseSse(response)) {
       const streamError = getOpenAICompatibleStreamError(event);
       if (streamError) {
@@ -6108,16 +6109,8 @@ var OpenAICompatibleProvider = class {
       const choice = event.choices?.[0];
       const delta = choice?.delta;
       if (delta?.content) {
-        if (this.contentToolCallParser && this.contentToolCallMarker) {
-          if (contentToolBuffer !== null) {
-            contentToolBuffer += delta.content;
-          } else if (delta.content.includes(this.contentToolCallMarker)) {
-            const markerPos = delta.content.indexOf(this.contentToolCallMarker);
-            if (markerPos > 0) yield { type: "delta", content: delta.content.slice(0, markerPos) };
-            contentToolBuffer = delta.content.slice(markerPos);
-          } else {
-            yield { type: "delta", content: delta.content };
-          }
+        if (bufferAllContent) {
+          bufferedContent += delta.content;
         } else {
           yield { type: "delta", content: delta.content };
         }
@@ -6159,8 +6152,10 @@ var OpenAICompatibleProvider = class {
         };
       }
     }
-    if (contentToolBuffer && this.contentToolCallParser) {
-      const parsed = this.contentToolCallParser(contentToolBuffer);
+    if (bufferAllContent && this.contentToolCallParser) {
+      const marker = this.contentToolCallMarker;
+      const likelyHasDsml = !marker || bufferedContent.includes(marker);
+      const parsed = likelyHasDsml ? this.contentToolCallParser(bufferedContent) : null;
       if (parsed) {
         if (parsed.remainder) yield { type: "delta", content: parsed.remainder };
         for (let i = 0; i < parsed.toolCalls.length; i++) {
@@ -6170,8 +6165,8 @@ var OpenAICompatibleProvider = class {
             call: { id: `dsml_${i}`, name: call.name, arguments: call.arguments }
           };
         }
-      } else {
-        yield { type: "delta", content: contentToolBuffer };
+      } else if (bufferedContent) {
+        yield { type: "delta", content: bufferedContent };
       }
     }
     for (const [index, call] of pendingTools) {
@@ -6340,30 +6335,31 @@ function toOpenAICompatibleToolChoice(toolChoice) {
   }
   return toolChoice;
 }
-var FF = "\uFF5C\uFF5C";
-var DSML_OPEN_TAG = `<${FF}DSML${FF}tool_calls>`;
-var DSML_CLOSE_TAG = `</${FF}DSML${FF}tool_calls>`;
+var PIPE_PAT = "[\uFF5C|]{1,2}";
+var DSML_HINT = "DSML";
+var TOOL_CALLS_OPEN_RE = new RegExp(`<${PIPE_PAT}DSML${PIPE_PAT}tool_calls>`, "i");
+var TOOL_CALLS_CLOSE_RE = new RegExp(`<\\/${PIPE_PAT}DSML${PIPE_PAT}tool_calls>`, "i");
+var INVOKE_RE_SRC = `<${PIPE_PAT}DSML${PIPE_PAT}invoke name="([^"]+)">(.*?)<\\/${PIPE_PAT}DSML${PIPE_PAT}invoke>`;
+var PARAM_RE_SRC = `<${PIPE_PAT}DSML${PIPE_PAT}parameter name="([^"]+)"([^>]*)>(.*?)<\\/${PIPE_PAT}DSML${PIPE_PAT}parameter>`;
 function parseDSMLToolCalls(content) {
-  const startIdx = content.indexOf(DSML_OPEN_TAG);
-  if (startIdx === -1) return null;
-  const endIdx = content.indexOf(DSML_CLOSE_TAG, startIdx);
-  if (endIdx === -1) return null;
-  const remainder = (content.slice(0, startIdx) + content.slice(endIdx + DSML_CLOSE_TAG.length)).trim();
-  const block = content.slice(startIdx + DSML_OPEN_TAG.length, endIdx);
+  const openMatch = TOOL_CALLS_OPEN_RE.exec(content);
+  if (!openMatch) return null;
+  const startIdx = openMatch.index;
+  const blockStart = startIdx + openMatch[0].length;
+  const closeMatch = TOOL_CALLS_CLOSE_RE.exec(content.slice(blockStart));
+  if (!closeMatch) return null;
+  const blockEnd = blockStart + closeMatch.index;
+  const closeEnd = blockEnd + closeMatch[0].length;
+  const remainder = (content.slice(0, startIdx) + content.slice(closeEnd)).trim();
+  const block = content.slice(blockStart, blockEnd);
   const toolCalls = [];
-  const invokeRe = new RegExp(
-    `<${FF}DSML${FF}invoke name="([^"]+)">(.*?)<\\/${FF}DSML${FF}invoke>`,
-    "gis"
-  );
+  const invokeRe = new RegExp(INVOKE_RE_SRC, "gis");
   let invokeMatch;
   while ((invokeMatch = invokeRe.exec(block)) !== null) {
     const toolName = invokeMatch[1];
     const paramBlock = invokeMatch[2];
     const args = {};
-    const paramRe = new RegExp(
-      `<${FF}DSML${FF}parameter name="([^"]+)"([^>]*)>(.*?)<\\/${FF}DSML${FF}parameter>`,
-      "gis"
-    );
+    const paramRe = new RegExp(PARAM_RE_SRC, "gis");
     let paramMatch;
     while ((paramMatch = paramRe.exec(paramBlock)) !== null) {
       const paramName = paramMatch[1];
@@ -6452,7 +6448,7 @@ var ProviderManager = class {
           thinking: buildDeepSeekThinkingOverride(context.model)
         }),
         contentToolCallParser: parseDSMLToolCalls,
-        contentToolCallMarker: DSML_OPEN_TAG
+        contentToolCallMarker: DSML_HINT
       })
     );
     this.register(
@@ -28428,7 +28424,7 @@ function parseVersion2(version) {
   if (!match) return null;
   return [Number(match[1]), Number(match[2]), Number(match[3])];
 }
-var VERSION = "1.1.38".length > 0 ? "1.1.38" : "0.0.0-dev";
+var VERSION = "1.1.39".length > 0 ? "1.1.39" : "0.0.0-dev";
 var updateCommand = {
   name: "update",
   description: "Check published DeepCode versions",