@marizmelo/llm-cli 0.0.4 → 0.0.6

package/bundle/gemini.js

@@ -139658,8 +139658,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "55b76129";
-    CLI_VERSION = "0.0.4";
+    GIT_COMMIT_INFO = "4e5c77fc";
+    CLI_VERSION = "0.0.6";
   }
 });
 
@@ -141926,60 +141926,59 @@ var init_ollama_provider = __esm({
       name = "ollama";
       baseUrl;
       model;
+      toolsSupported = true;
       constructor(config, gcConfig) {
         this.baseUrl = config.baseUrl || "http://localhost:11434";
         this.model = config.model;
       }
       async generateContent(request3, userPromptId) {
         const messages = this.convertToOllamaMessages(request3);
-        const tools = this.convertToOllamaTools(request3);
+        const tools = this.toolsSupported ? this.convertToOllamaTools(request3) : [];
         const ollamaRequest = {
           model: this.model,
           messages,
           stream: false,
           ...tools.length > 0 ? { tools } : {},
-          options: {
-            temperature: request3.generationConfig?.temperature ?? request3.config?.temperature ?? 0,
-            top_p: request3.generationConfig?.topP ?? request3.config?.topP ?? 1,
-            num_predict: request3.generationConfig?.maxOutputTokens ?? request3.config?.maxOutputTokens
-          }
+          options: this.buildOptions(request3)
         };
         const response = await fetch(`${this.baseUrl}/api/chat`, {
           method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
+          headers: { "Content-Type": "application/json" },
           body: JSON.stringify(ollamaRequest)
         });
         if (!response.ok) {
-          throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
+          const body = await response.text().catch(() => "");
+          if (this.isToolsNotSupportedError(body) && tools.length > 0) {
+            this.toolsSupported = false;
+            return this.generateContent(request3, userPromptId);
+          }
+          throw new Error(`Ollama API error: ${response.status} ${response.statusText} - ${body}`);
         }
         const ollamaResponse = await response.json();
         return this.convertFromOllamaChatResponse(ollamaResponse);
       }
       async generateContentStream(request3, userPromptId) {
         const messages = this.convertToOllamaMessages(request3);
-        const tools = this.convertToOllamaTools(request3);
+        const tools = this.toolsSupported ? this.convertToOllamaTools(request3) : [];
         const ollamaRequest = {
           model: this.model,
           messages,
           stream: true,
           ...tools.length > 0 ? { tools } : {},
-          options: {
-            temperature: request3.generationConfig?.temperature ?? request3.config?.temperature ?? 0,
-            top_p: request3.generationConfig?.topP ?? request3.config?.topP ?? 1,
-            num_predict: request3.generationConfig?.maxOutputTokens ?? request3.config?.maxOutputTokens
-          }
+          options: this.buildOptions(request3)
         };
         const response = await fetch(`${this.baseUrl}/api/chat`, {
           method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
+          headers: { "Content-Type": "application/json" },
           body: JSON.stringify(ollamaRequest)
         });
         if (!response.ok) {
-          throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
+          const body = await response.text().catch(() => "");
+          if (this.isToolsNotSupportedError(body) && tools.length > 0) {
+            this.toolsSupported = false;
+            return this.generateContentStream(request3, userPromptId);
+          }
+          throw new Error(`Ollama API error: ${response.status} ${response.statusText} - ${body}`);
         }
         const reader = response.body?.getReader();
         if (!reader) {
@@ -142027,6 +142026,37 @@ var init_ollama_provider = __esm({
       validateConfig(config) {
         return config.provider === "ollama" && !!config.model;
       }
+      isToolsNotSupportedError(body) {
+        const lower = body.toLowerCase();
+        return lower.includes("does not support tools") || lower.includes("tool use is not supported");
+      }
+      parseToolArgs(args) {
+        if (args === null || args === void 0)
+          return {};
+        if (typeof args === "object" && !Array.isArray(args))
+          return args;
+        if (typeof args === "string") {
+          try {
+            return JSON.parse(args);
+          } catch {
+            return {};
+          }
+        }
+        return {};
+      }
+      buildOptions(request3) {
+        const options2 = {};
+        const temp = request3.generationConfig?.temperature ?? request3.config?.temperature;
+        if (temp !== void 0)
+          options2.temperature = temp;
+        const topP = request3.generationConfig?.topP ?? request3.config?.topP;
+        if (topP !== void 0)
+          options2.top_p = topP;
+        const maxTokens = request3.generationConfig?.maxOutputTokens ?? request3.config?.maxOutputTokens;
+        if (maxTokens !== void 0)
+          options2.num_predict = maxTokens;
+        return options2;
+      }
       convertToOllamaMessages(request3) {
         const messages = [];
         if (request3.systemInstruction) {
@@ -142107,12 +142137,11 @@ var init_ollama_provider = __esm({
         }
         if (message?.tool_calls) {
           for (const toolCall of message.tool_calls) {
-            if (toolCall.function) {
-              const args = typeof toolCall.function.arguments === "string" ? JSON.parse(toolCall.function.arguments) : toolCall.function.arguments || {};
+            if (toolCall.function?.name) {
               parts.push({
                 functionCall: {
                   name: toolCall.function.name,
-                  args
+                  args: this.parseToolArgs(toolCall.function.arguments)
                 }
               });
             }
@@ -142166,10 +142195,12 @@ var init_ollama_provider = __esm({
                 }
                 if (chunk.message?.tool_calls) {
                   for (const toolCall of chunk.message.tool_calls) {
-                    if (toolCall.function) {
-                      const args = typeof toolCall.function.arguments === "string" ? JSON.parse(toolCall.function.arguments) : toolCall.function.arguments || {};
+                    if (toolCall.function?.name) {
                       accumulatedToolCalls.push({
-                        function: { name: toolCall.function.name, arguments: args }
+                        function: {
+                          name: toolCall.function.name,
+                          arguments: this.parseToolArgs(toolCall.function.arguments)
+                        }
                       });
                     }
                   }
@@ -142365,7 +142396,7 @@ function createContentGeneratorConfig(config, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.0.4";
+  const version2 = "0.0.6";
   const userAgent2 = `GeminiCLI/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -274727,7 +274758,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.0.4";
+  return "0.0.6";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -274779,7 +274810,7 @@ init_open();
 import process30 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "55b76129";
+var GIT_COMMIT_INFO2 = "4e5c77fc";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 init_dist3();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marizmelo/llm-cli",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "engines": {
     "node": ">=20.0.0"
   },