deepcode-ai 1.1.36 → 1.1.38

package/dist/index.js

@@ -3358,8 +3358,11 @@ function isSimpleDirectCommand(input) {
   return normalized2.split(/\s+/).length <= 20;
 }
 function resolveExecutionTarget(config, session, mode, explicitProvider) {
+  if (session.metadata.providerPinned === true && !explicitProvider) {
+    return { provider: session.provider, model: session.model };
+  }
   const modeOverride = config.modeDefaults?.[mode];
-  const hasPinnedProvider = Boolean(explicitProvider ?? modeOverride?.provider) || session.metadata.providerPinned === true;
+  const hasPinnedProvider = Boolean(explicitProvider ?? modeOverride?.provider);
   const provider = explicitProvider ?? modeOverride?.provider ?? session.provider ?? config.defaultProvider ?? resolveUsableProviderTarget(config, []).provider;
   const modeModel = modeOverride?.provider && modeOverride.provider !== provider ? void 0 : modeOverride?.model;
   const model = modeModel ?? (provider === session.provider ? session.model : void 0) ?? resolveConfiguredModelForProvider(config, provider);
@@ -6046,6 +6049,8 @@ var OpenAICompatibleProvider = class {
   extraHeaders;
   normalizeModelId;
   buildRequestBody;
+  contentToolCallParser;
+  contentToolCallMarker;
   apiKeyOptional;
   constructor(options) {
     this.id = options.id;
@@ -6056,6 +6061,8 @@ var OpenAICompatibleProvider = class {
     this.extraHeaders = options.extraHeaders ?? {};
     this.normalizeModelId = options.normalizeModelId;
     this.buildRequestBody = options.buildRequestBody;
+    this.contentToolCallParser = options.contentToolCallParser;
+    this.contentToolCallMarker = options.contentToolCallMarker;
     this.apiKeyOptional = options.apiKeyOptional ?? false;
   }
   async *chat(messages, options) {
@@ -6089,6 +6096,7 @@ var OpenAICompatibleProvider = class {
     await this.assertOk(response);
     const pendingTools = /* @__PURE__ */ new Map();
     let lastUsage = null;
+    let contentToolBuffer = null;
     for await (const event of parseSse(response)) {
       const streamError = getOpenAICompatibleStreamError(event);
       if (streamError) {
@@ -6100,7 +6108,19 @@ var OpenAICompatibleProvider = class {
       const choice = event.choices?.[0];
       const delta = choice?.delta;
       if (delta?.content) {
-        yield { type: "delta", content: 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 };
+          }
+        } else {
+          yield { type: "delta", content: delta.content };
+        }
       }
       if (typeof delta?.reasoning_content === "string" && delta.reasoning_content.length > 0) {
         yield { type: "reasoning", content: delta.reasoning_content };
@@ -6139,6 +6159,21 @@ var OpenAICompatibleProvider = class {
         };
       }
     }
+    if (contentToolBuffer && this.contentToolCallParser) {
+      const parsed = this.contentToolCallParser(contentToolBuffer);
+      if (parsed) {
+        if (parsed.remainder) yield { type: "delta", content: parsed.remainder };
+        for (let i = 0; i < parsed.toolCalls.length; i++) {
+          const call = parsed.toolCalls[i];
+          yield {
+            type: "tool_call",
+            call: { id: `dsml_${i}`, name: call.name, arguments: call.arguments }
+          };
+        }
+      } else {
+        yield { type: "delta", content: contentToolBuffer };
+      }
+    }
     for (const [index, call] of pendingTools) {
       if (!call.name) continue;
       yield {
@@ -6305,6 +6340,56 @@ 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>`;
+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 toolCalls = [];
+  const invokeRe = new RegExp(
+    `<${FF}DSML${FF}invoke name="([^"]+)">(.*?)<\\/${FF}DSML${FF}invoke>`,
+    "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"
+    );
+    let paramMatch;
+    while ((paramMatch = paramRe.exec(paramBlock)) !== null) {
+      const paramName = paramMatch[1];
+      const paramAttrs = paramMatch[2];
+      const rawValue = paramMatch[3].trim();
+      args[paramName] = coerceDSMLParam(rawValue, paramAttrs);
+    }
+    toolCalls.push({ name: toolName, arguments: args });
+  }
+  return { toolCalls, remainder };
+}
+function coerceDSMLParam(value, attrs) {
+  if (/\bstring="true"/i.test(attrs)) return value;
+  if (/\bnumber="true"/i.test(attrs)) {
+    const n = Number(value);
+    return Number.isNaN(n) ? value : n;
+  }
+  if (/\bboolean="true"/i.test(attrs)) {
+    return value.toLowerCase() === "true";
+  }
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
 var RETRYABLE_STATUS_CODES = /* @__PURE__ */ new Set([408, 429, 502, 503, 504]);
 var MODEL_CATALOG_GRACE_MS = 250;
 function isRetryableError(error) {
@@ -6365,7 +6450,9 @@ var ProviderManager = class {
         buildRequestBody: (body, context) => ({
           ...body,
           thinking: buildDeepSeekThinkingOverride(context.model)
-        })
+        }),
+        contentToolCallParser: parseDSMLToolCalls,
+        contentToolCallMarker: DSML_OPEN_TAG
       })
     );
     this.register(
@@ -28341,7 +28428,7 @@ function parseVersion2(version) {
   if (!match) return null;
   return [Number(match[1]), Number(match[2]), Number(match[3])];
 }
-var VERSION = "1.1.36".length > 0 ? "1.1.36" : "0.0.0-dev";
+var VERSION = "1.1.38".length > 0 ? "1.1.38" : "0.0.0-dev";
 var updateCommand = {
   name: "update",
   description: "Check published DeepCode versions",