@bike4mind/cli 0.2.37 → 0.2.38-add-notebook-project-fixes.20160

package/dist/{artifactExtractor-QIDCYO4J.js → artifactExtractor-Z6UQO2IR.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   CurationArtifactType
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 
 // ../../b4m-core/packages/services/dist/src/notebookCurationService/artifactExtractor.js
 var ARTIFACT_TAG_REGEX = /<artifact\s+(.*?)>([\s\S]*?)<\/artifact>/gi;

package/dist/{chunk-AOP6RYDY.js → chunk-5APQNY55.js}

@@ -7,11 +7,11 @@ import {
   getSettingsMap,
   getSettingsValue,
   secureParameters
-} from "./chunk-5YLGNW2B.js";
+} from "./chunk-QCDYXXSD.js";
 import {
   KnowledgeType,
   SupportedFabFileMimeTypes
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 
 // ../../b4m-core/packages/services/dist/src/fabFileService/create.js
 import { z } from "zod";

package/dist/{chunk-LJG44UT3.js → chunk-AU7OYPU4.js}

@@ -2,7 +2,7 @@
 import {
   BadRequestError,
   secureParameters
-} from "./chunk-5YLGNW2B.js";
+} from "./chunk-QCDYXXSD.js";
 import {
   CompletionApiUsageTransaction,
   GenericCreditDeductTransaction,
@@ -13,7 +13,7 @@ import {
   ToolUsageTransaction,
   TransferCreditTransaction,
   VideoGenerationUsageTransaction
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 
 // ../../b4m-core/packages/services/dist/src/creditService/subtractCredits.js
 import { z } from "zod";

package/dist/{chunk-FACWWYF7.js → chunk-F4TQZA4G.js}

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.37",
+  version: "0.2.38-add-notebook-project-fixes.20160+6312c53db",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -117,10 +117,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.58.0",
-    "@bike4mind/mcp": "1.32.5",
-    "@bike4mind/services": "2.54.1",
-    "@bike4mind/utils": "2.11.0",
+    "@bike4mind/common": "2.58.1-add-notebook-project-fixes.20160+6312c53db",
+    "@bike4mind/mcp": "1.32.6-add-notebook-project-fixes.20160+6312c53db",
+    "@bike4mind/services": "2.54.2-add-notebook-project-fixes.20160+6312c53db",
+    "@bike4mind/utils": "2.11.1-add-notebook-project-fixes.20160+6312c53db",
     "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
@@ -138,7 +138,7 @@ var package_default = {
   optionalDependencies: {
     "@vscode/ripgrep": "^1.17.0"
   },
-  gitHead: "474cb1d4152b065eb696701af0f8c20fb8daed57"
+  gitHead: "6312c53db7d33ec00d8d5c85e4c7d04177fbf7f0"
 };
 
 // src/utils/updateChecker.ts

package/dist/{chunk-H7RVLAQD.js → chunk-HJVFUXVX.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ChatModels
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 import {
   DEFAULT_SANDBOX_CONFIG
 } from "./chunk-4BIBE3J7.js";

package/dist/{chunk-NJQYWIDJ.js → chunk-J3YSVA6W.js}

@@ -6,12 +6,12 @@ import {
   getSettingsByNames,
   obfuscateApiKey,
   secureParameters
-} from "./chunk-5YLGNW2B.js";
+} from "./chunk-QCDYXXSD.js";
 import {
   ApiKeyType,
   MementoTier,
   isSupportedEmbeddingModel
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 
 // ../../b4m-core/packages/services/dist/src/apiKeyService/get.js
 import { z } from "zod";

package/dist/{chunk-EY65E4W4.js → chunk-OCFOJXLA.js}

@@ -641,6 +641,7 @@ var CollectionType;
   CollectionType2["PROJECT"] = "project";
   CollectionType2["AI_IMAGE"] = "ai_image";
 })(CollectionType || (CollectionType = {}));
+var ROTATABLE_INTEGRATIONS = ["github", "atlassian", "slack"];
 
 // ../../b4m-core/packages/common/dist/src/types/entities/UserApiKeyTypes.js
 var ApiKeyScope;
@@ -1130,6 +1131,17 @@ var JiraWebhookDeliveryStatus;
   JiraWebhookDeliveryStatus2["Pending"] = "pending";
 })(JiraWebhookDeliveryStatus || (JiraWebhookDeliveryStatus = {}));
 
+// ../../b4m-core/packages/common/dist/src/types/entities/SystemPromptTypes.js
+var AdminSystemPromptCategory;
+(function(AdminSystemPromptCategory2) {
+  AdminSystemPromptCategory2["SYSTEM"] = "system";
+  AdminSystemPromptCategory2["ADMIN"] = "admin";
+  AdminSystemPromptCategory2["AUTOMATION"] = "automation";
+  AdminSystemPromptCategory2["VOICE"] = "voice";
+  AdminSystemPromptCategory2["QUANTUM"] = "quantum";
+  AdminSystemPromptCategory2["SALES_INTELLIGENCE"] = "sales_intelligence";
+})(AdminSystemPromptCategory || (AdminSystemPromptCategory = {}));
+
 // ../../b4m-core/packages/common/dist/src/types/common.js
 var SupportedFabFileMimeTypes;
 (function(SupportedFabFileMimeTypes2) {
@@ -5780,6 +5792,7 @@ var LinkedInApi = class {
 };
 
 // ../../b4m-core/packages/common/dist/src/rateLimitHeaders.js
+var RATE_LIMIT_INTEGRATIONS = ["github", "jira", "confluence", "slack"];
 function getHeader(headers, name) {
   if (!headers || typeof headers !== "object")
     return null;
@@ -5828,16 +5841,24 @@ function parseRateLimitHeaders(headers) {
     }
   }
   let usagePercent = null;
-  if (limit !== null && limit > 0 && remaining !== null) {
+  if (limit !== null && limit > 0 && remaining !== null && remaining >= 0) {
     usagePercent = Math.round((limit - remaining) / limit * 100);
   }
   return { limit, remaining, resetAt, retryAfterMs, usagePercent };
 }
+function hasRateLimitInfo(info) {
+  return info.limit !== null || info.remaining !== null || info.retryAfterMs !== null;
+}
 function isNearLimit(info, thresholdPercent = 80) {
   if (info.usagePercent === null)
     return false;
   return info.usagePercent >= thresholdPercent;
 }
+function normalizeEndpoint(endpoint) {
+  if (!endpoint || !endpoint.includes("/"))
+    return endpoint;
+  return endpoint.replace(/\/[A-Z][A-Z0-9]+-\d+/g, "/{key}").replace(/\/\d+/g, "/{id}").replace(/\/repos\/[^/]+\/[^/]+/, "/repos/{owner}/{repo}");
+}
 function buildRateLimitLogEntry(integration, endpoint, info, wasThrottled = false) {
   return {
     type: wasThrottled ? "RATE_LIMIT_ERROR" : "RATE_LIMIT",
@@ -6108,16 +6129,17 @@ var ConfluenceApi = class {
       body: options.body ? JSON.stringify(options.body) : void 0
     });
     const rateLimitInfo = parseRateLimitHeaders(response.headers);
-    if (rateLimitInfo.remaining !== null) {
+    if (hasRateLimitInfo(rateLimitInfo)) {
       const logEntry = buildRateLimitLogEntry("confluence", path, rateLimitInfo);
       console.error(JSON.stringify(logEntry));
-    }
-    if (isNearLimit(rateLimitInfo)) {
-      console.error(`[Confluence] Rate limit warning: ${rateLimitInfo.usagePercent}% used (${rateLimitInfo.remaining}/${rateLimitInfo.limit} remaining)`);
+      if (isNearLimit(rateLimitInfo)) {
+        console.error(`[Confluence] Rate limit warning: ${rateLimitInfo.usagePercent}% used (${rateLimitInfo.remaining}/${rateLimitInfo.limit} remaining)`);
+      }
     }
     if (response.status === 429 && (options._retryCount ?? 0) < 1) {
       const retryAfterMs = rateLimitInfo.retryAfterMs ?? 5e3;
-      const delayMs = Math.min(retryAfterMs, 1e4);
+      const jitterMs = Math.floor(Math.random() * 1e3);
+      const delayMs = Math.min(retryAfterMs + jitterMs, 1e4);
       const logEntry = buildRateLimitLogEntry("confluence", path, rateLimitInfo, true);
       console.error(JSON.stringify(logEntry));
       console.error(`[Confluence] Rate limited on ${path}, retrying after ${delayMs}ms`);
@@ -8327,16 +8349,17 @@ var JiraApi = class {
       body: options.body ? JSON.stringify(options.body) : void 0
     });
     const rateLimitInfo = parseRateLimitHeaders(response.headers);
-    if (rateLimitInfo.remaining !== null) {
+    if (hasRateLimitInfo(rateLimitInfo)) {
       const logEntry = buildRateLimitLogEntry("jira", path, rateLimitInfo);
       console.error(JSON.stringify(logEntry));
-    }
-    if (isNearLimit(rateLimitInfo)) {
-      console.error(`[Jira] Rate limit warning: ${rateLimitInfo.usagePercent}% used (${rateLimitInfo.remaining}/${rateLimitInfo.limit} remaining)`);
+      if (isNearLimit(rateLimitInfo)) {
+        console.error(`[Jira] Rate limit warning: ${rateLimitInfo.usagePercent}% used (${rateLimitInfo.remaining}/${rateLimitInfo.limit} remaining)`);
+      }
     }
     if (response.status === 429 && (options._retryCount ?? 0) < 1) {
       const retryAfterMs = rateLimitInfo.retryAfterMs ?? 5e3;
-      const delayMs = Math.min(retryAfterMs, 1e4);
+      const jitterMs = Math.floor(Math.random() * 1e3);
+      const delayMs = Math.min(retryAfterMs + jitterMs, 1e4);
       const logEntry = buildRateLimitLogEntry("jira", path, rateLimitInfo, true);
       console.error(JSON.stringify(logEntry));
       console.error(`[Jira] Rate limited on ${path}, retrying after ${delayMs}ms`);
@@ -10418,6 +10441,7 @@ export {
   shareableDocumentSchema,
   DefaultLLMParams,
   CollectionType,
+  ROTATABLE_INTEGRATIONS,
   ApiKeyScope,
   ApiKeyStatus,
   MementoTier,
@@ -10473,6 +10497,7 @@ export {
   WebhookAuditStatus,
   COMMON_JIRA_WEBHOOK_EVENTS,
   JiraWebhookDeliveryStatus,
+  AdminSystemPromptCategory,
   SupportedFabFileMimeTypes,
   REASONING_EFFORT_LABELS,
   REASONING_EFFORT_DESCRIPTIONS,
@@ -10693,8 +10718,11 @@ export {
   extractSnippetMeta,
   searchSchema,
   LinkedInApi,
+  RATE_LIMIT_INTEGRATIONS,
   parseRateLimitHeaders,
+  hasRateLimitInfo,
   isNearLimit,
+  normalizeEndpoint,
   buildRateLimitLogEntry,
   RESTRICTION_OPERATIONS,
   RESTRICTION_SUBJECT_TYPES,

package/dist/{chunk-5YLGNW2B.js → chunk-QCDYXXSD.js}

@@ -19,7 +19,7 @@ import {
   dayjsConfig_default,
   extractSnippetMeta,
   settingsMap
-} from "./chunk-EY65E4W4.js";
+} from "./chunk-OCFOJXLA.js";
 
 // ../../b4m-core/packages/utils/dist/src/storage/S3Storage.js
 import { S3Client, PutObjectCommand, DeleteObjectCommand, GetObjectCommand, HeadObjectCommand } from "@aws-sdk/client-s3";
@@ -2995,7 +2995,7 @@ IMPORTANT! Only when someone asks, remember that you are specifically the ${mode
     const modelInfo = await this.getModelInfo();
     const currentModelInfo = modelInfo.find((m) => m.id === model);
     if (currentModelInfo?.can_think) {
-      if (options.thinking?.enabled !== false) {
+      if (options.thinking?.enabled === true) {
         const thinkingBudget = options.thinking?.budget_tokens ?? 16e3;
         apiParams.max_tokens = Math.max(apiParams.max_tokens ?? 4096, thinkingBudget + 1e3);
         apiParams.temperature = 1;
@@ -3547,13 +3547,27 @@ IMPORTANT! Only when someone asks, remember that you are specifically the ${mode
       };
     });
   }
-  pushToolMessages(messages, tool, result, previousMessage) {
+  pushToolMessages(messages, tool, result, thinkingBlocks) {
     if (this.isThinkingEnabled && this.lastAssistantContent.length > 0) {
       messages.push({
         role: "assistant",
         content: this.lastAssistantContent
       });
       this.logger.debug(`[AnthropicBackend] Including ${this.lastAssistantContent.length} content blocks (thinking + tool_use) in assistant message`);
+    } else if (thinkingBlocks && thinkingBlocks.length > 0) {
+      messages.push({
+        role: "assistant",
+        content: [
+          ...thinkingBlocks,
+          {
+            type: "tool_use",
+            id: tool.id,
+            name: tool.name,
+            input: JSON.parse(tool.parameters || "{}")
+          }
+        ]
+      });
+      this.logger.debug(`[AnthropicBackend] Including ${thinkingBlocks.length} explicit thinking blocks in assistant message`);
     } else {
       messages.push({
         role: "assistant",
@@ -3700,6 +3714,9 @@ var AWSBackend = class {
     this.currentModel = model;
     throw new Error("AWSBackend does not support text completion, only speech-to-text transcription");
   }
+  pushToolMessages(_messages, _tool, _result) {
+    throw new Error("AWSBackend does not support tool messages");
+  }
   async getModelInfo() {
     return [
       {
@@ -4351,7 +4368,7 @@ ${modelIdentity}` : modelIdentity;
     }
     const supportsThinking = model.includes("claude-3-7") || model.includes("claude-opus-4") || model.includes("claude-sonnet-4");
     if (supportsThinking) {
-      if (options.thinking?.enabled !== false) {
+      if (options.thinking?.enabled === true) {
         const thinkingBudget = options.thinking?.budget_tokens ?? 16e3;
         body.max_tokens = Math.max(maxTokens, thinkingBudget + 1e3);
         body.temperature = 1;
@@ -4604,18 +4621,17 @@ ${modelIdentity}` : modelIdentity;
       };
     });
   }
-  pushToolMessages(messages, tool, result) {
-    const assistantMessage = [
-      {
-        type: "tool_use",
-        id: tool.id,
-        name: tool.name,
-        input: JSON.parse(tool.parameters || "{}")
-      }
-    ];
+  pushToolMessages(messages, tool, result, thinkingBlocks) {
+    const toolUseBlock = {
+      type: "tool_use",
+      id: tool.id,
+      name: tool.name,
+      input: JSON.parse(tool.parameters || "{}")
+    };
+    const assistantContent = thinkingBlocks && thinkingBlocks.length > 0 ? [...thinkingBlocks, toolUseBlock] : [toolUseBlock];
     messages.push({
       role: "assistant",
-      content: assistantMessage
+      content: assistantContent
     });
     messages.push({
       role: "user",
@@ -4817,7 +4833,7 @@ ${finalResponse}`;
   translateStreamChunk(model, chunk) {
     return this.translateChunk(model, chunk);
   }
-  pushToolMessages(messages, _tool, _result) {
+  pushToolMessages(messages, _tool, _result, _thinkingBlocks) {
     return messages;
   }
 };
@@ -4922,7 +4938,7 @@ ${m.content}
       }
     };
   }
-  pushToolMessages(_messages, _tool, _result) {
+  pushToolMessages(_messages, _tool, _result, _thinkingBlocks) {
     throw new Error("Bedrock JurassicTwo: pushToolMessages not yet supported.");
   }
 };
@@ -5089,7 +5105,7 @@ var LlamaBedrockBackend = class extends BaseBedrockBackend {
       }
     };
   }
-  pushToolMessages(messages, _tool, _result) {
+  pushToolMessages(messages, _tool, _result, _thinkingBlocks) {
     return messages;
   }
 };
@@ -5250,7 +5266,7 @@ var TitanBedrockBackend = class extends BaseBedrockBackend {
     }
     throw new Error("Bedrock Titan: Unsupported chunk format.");
   }
-  pushToolMessages(_messages, _tool, _result) {
+  pushToolMessages(_messages, _tool, _result, _thinkingBlocks) {
     throw new Error("Bedrock Titan: push tool messages not supported.");
   }
 };
@@ -5278,7 +5294,7 @@ var UndifferentiatedBedrockBackend = class extends BaseBedrockBackend {
   translateChunk(model, chunk) {
     throw new Error("UndifferentiatedBedrockBackend does not support translateChunk");
   }
-  pushToolMessages(messages, tool, result) {
+  pushToolMessages(messages, tool, result, _thinkingBlocks) {
     throw new Error("UndifferentiatedBedrockBackend does not support pushToolMessages");
   }
 };
@@ -5294,6 +5310,9 @@ var BFLBackend = class {
     this.currentModel = model;
     throw new Error("BFLBackend does not support text completion, only image generation");
   }
+  pushToolMessages(_messages, _tool, _result, _thinkingBlocks) {
+    throw new Error("BFLBackend does not support tool messages");
+  }
   async getModelInfo() {
     return [
       // BFL Models first - modern, state-of-the-art image generation
@@ -5479,15 +5498,17 @@ var GeminiBackend = class {
     } else {
       this.logger.warn("[Gemini] Missing thought_signature for tool call:", { toolName });
     }
+    const toolId = uuidv4();
     toolCalls.push({
-      id: uuidv4(),
+      id: toolId,
       name: toolName,
       parameters: toolArgs,
       thought_signature: thoughtSignature
     });
     toolsUsed.push({
       name: toolName,
-      arguments: JSON.stringify(toolArgs)
+      arguments: JSON.stringify(toolArgs),
+      id: toolId
     });
   }
   async getModelInfo() {
@@ -5862,8 +5883,9 @@ var GeminiBackend = class {
             description: tool.toolSchema.description,
             parameters: {
               ...params,
-              type: params.type.toUpperCase()
+              type: params.type.toUpperCase(),
               // "object" -> "OBJECT"
+              properties: params.properties ? this.sanitizeProperties(params.properties) : params.properties
             }
           };
         })
@@ -6046,7 +6068,24 @@ var GeminiBackend = class {
             logCacheStats(this.logger, cacheStats, { streaming: false });
           }
         }
-        await callback(r.candidates?.map((candidate) => candidate.content?.parts?.[0]?.text) ?? [], {
+        const textParts = [];
+        r.candidates?.forEach((candidate) => {
+          candidate.content?.parts?.forEach((part) => {
+            if (part.text) {
+              textParts.push(part.text);
+            }
+            if (part.functionCall) {
+              this.registerToolCall(part.functionCall, part, toolCalls, toolsUsed);
+            }
+            if (part.function_call) {
+              this.registerToolCall(part.function_call, part, toolCalls, toolsUsed);
+            }
+            if (part.name && part.args && !part.text) {
+              this.registerToolCall({ name: part.name, args: part.args }, part, toolCalls, toolsUsed);
+            }
+          });
+        });
+        await callback(textParts.length ? textParts : [], {
           inputTokens: r.usageMetadata?.promptTokenCount ?? 0,
           outputTokens: r.usageMetadata?.candidatesTokenCount ?? 0,
           toolsUsed,
@@ -6252,12 +6291,80 @@ var GeminiBackend = class {
       }
     ];
   }
+  /**
+   * Strip JSON Schema fields that Gemini's API doesn't support
+   * (e.g., exclusiveMinimum, exclusiveMaximum, additionalProperties on nested objects).
+   */
+  sanitizeProperties(properties) {
+    const unsupportedFields = [
+      "exclusiveMinimum",
+      "exclusiveMaximum",
+      "minLength",
+      "maxLength",
+      "pattern",
+      "minItems",
+      "maxItems",
+      "uniqueItems",
+      "additionalProperties",
+      "default",
+      "$schema"
+    ];
+    const sanitized = {};
+    for (const [key, value] of Object.entries(properties)) {
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        const prop = { ...value };
+        for (const field of unsupportedFields) {
+          delete prop[field];
+        }
+        if (prop.properties && typeof prop.properties === "object") {
+          prop.properties = this.sanitizeProperties(prop.properties);
+        }
+        if (prop.items && typeof prop.items === "object") {
+          const items = { ...prop.items };
+          for (const field of unsupportedFields) {
+            delete items[field];
+          }
+          if (items.properties && typeof items.properties === "object") {
+            items.properties = this.sanitizeProperties(items.properties);
+          }
+          prop.items = items;
+        }
+        sanitized[key] = prop;
+      } else {
+        sanitized[key] = value;
+      }
+    }
+    return sanitized;
+  }
   getGenerationConfig(model, options) {
     return {
       temperature: options.temperature ?? 0.9,
       maxOutputTokens: options.maxTokens ?? 8192
     };
   }
+  pushToolMessages(messages, tool, result, _thinkingBlocks) {
+    messages.push({
+      role: "assistant",
+      content: [
+        {
+          type: "tool_use",
+          id: tool.id,
+          name: tool.name,
+          input: JSON.parse(tool.parameters || "{}")
+        }
+      ]
+    });
+    messages.push({
+      role: "tool",
+      content: [
+        {
+          type: "tool_result",
+          tool_use_id: tool.id,
+          content: result
+        }
+      ]
+    });
+  }
 };
 
 // ../../b4m-core/packages/utils/dist/src/llm/ollamaBackend.js
@@ -6381,29 +6488,27 @@ var OllamaBackend = class {
       };
     });
   }
-  // TODO: Tool support will be added in a future epic
-  // private pushToolMessages(messages: IMessage[], tool: IChoiceEndToolUse['tool'], result: string) {
-  //   const toolCallMessage: ExtendedIMessage = {
-  //     content: '',
-  //     role: 'assistant',
-  //     tool_calls: [
-  //       {
-  //         id: tool.id,
-  //         type: 'function',
-  //         function: {
-  //           name: tool.name,
-  //           arguments: tool.parameters,
-  //         },
-  //       },
-  //     ],
-  //   };
-  //   const resultMessage: ExtendedIMessage = {
-  //     role: 'tool',
-  //     content: JSON.stringify({ result }),
-  //     tool_call_id: tool.id,
-  //   };
-  //   messages.push(toolCallMessage, resultMessage);
-  // }
+  pushToolMessages(messages, tool, result, _thinkingBlocks) {
+    messages.push({
+      content: null,
+      role: "assistant",
+      tool_calls: [
+        {
+          id: tool.id,
+          type: "function",
+          function: {
+            name: tool.name,
+            arguments: tool.parameters
+          }
+        }
+      ]
+    });
+    messages.push({
+      role: "tool",
+      content: result,
+      tool_call_id: tool.id
+    });
+  }
   // private formatTools(tools: ICompletionOptionTools[]): Tool[] {
   //   return tools.map(tool => ({
   //     type: 'function' as const,
@@ -7169,7 +7274,8 @@ var OpenAIBackend = class {
             if (toolCall.function.arguments) {
               toolsUsed.push({
                 name: toolCall.function.name,
-                arguments: toolCall.function.arguments
+                arguments: toolCall.function.arguments,
+                id: toolCall.id
               });
             }
           }
@@ -7343,7 +7449,8 @@ var OpenAIBackend = class {
         if (tool.name && tool.parameters) {
           toolsUsed.push({
             name: tool.name,
-            arguments: tool.parameters
+            arguments: tool.parameters,
+            id: tool.id
           });
         }
       }
@@ -7448,7 +7555,7 @@ Only when someone asks, remember that you are specifically the ${model} model.`;
     });
     return isO1Model ? formattedMessages : [systemMessage, ...formattedMessages];
   }
-  pushToolMessages(messages, tool, result) {
+  pushToolMessages(messages, tool, result, _thinkingBlocks) {
     messages.push({
       content: null,
       role: "assistant",
@@ -7726,7 +7833,7 @@ var XAIBackend = class {
       parameters.tools = this.formatTools(options.tools);
     }
     const supportsThinking = await this.modelSupportsThinking(model);
-    const thinkingEnabled = supportsThinking && options.thinking?.enabled !== false;
+    const thinkingEnabled = supportsThinking && options.thinking?.enabled === true;
     const cacheStrategy = options.cacheStrategy;
     let headers = {};
     if (cacheStrategy?.enableCaching) {
@@ -7764,7 +7871,8 @@ var XAIBackend = class {
             if (toolCall.function.arguments) {
               toolsUsed.push({
                 name: toolCall.function.name,
-                arguments: toolCall.function.arguments
+                arguments: toolCall.function.arguments,
+                id: toolCall.id
               });
             }
           }
@@ -7905,11 +8013,12 @@ var XAIBackend = class {
     }
     if (func.length > 0) {
       for await (const tool of func) {
-        const { name, parameters: parameters2 } = tool;
+        const { name, parameters: parameters2, id } = tool;
         if (name) {
           toolsUsed.push({
             name,
-            arguments: parameters2 || "{}"
+            arguments: parameters2 || "{}",
+            id
           });
         }
       }
@@ -7984,7 +8093,7 @@ var XAIBackend = class {
       function: tool.toolSchema
     }));
   }
-  pushToolMessages(messages, tool, result) {
+  pushToolMessages(messages, tool, result, _thinkingBlocks) {
     messages.push({
       content: null,
       role: "assistant",