@marizmelo/llm-cli 0.0.5 → 0.0.7

package/README.md

@@ -28,32 +28,24 @@ llm-cli --prompt "What is 2+2?"
 - 🎯 Provider-specific model switching
 - 💾 Memory and context management
 - 🔑 Secure API key management with persistent settings
-- 🛠️ Full tool/function calling support for OpenAI and Anthropic
+- 🛠️ Full tool/function calling support for OpenAI, Anthropic, and Ollama
 
-## What's New in v0.1.0
+## Provider Setup
 
-### Enhanced Provider Support
-- **OpenAI & Anthropic Tool Support**: Both providers now have full function/tool calling capabilities, allowing them to use all available CLI tools (file operations, shell commands, web searches, etc.)
-- **Persistent API Key Management**: API keys are now saved to settings and automatically synced to environment variables on startup
-- **Improved Provider Setup**: Simplified setup process with `/provider setup <provider> <api-key>` command
-- **Better Error Handling**: Fixed streaming response issues and improved error messages
-
-### Provider Setup
-
-#### Quick Setup (New Method)
+### Quick Setup
 ```bash
-# Setup providers with persistent API keys
+# Setup cloud providers with persistent API keys
 llm-cli
 /provider setup openai sk-your-api-key
 /provider setup anthropic sk-ant-your-api-key
 /provider switch openai
 ```
 
-#### Ollama (Local)
+### Ollama (Local)
 ```bash
 # 1. Install Ollama (https://ollama.com)
-# 2. Pull a model
-ollama pull llama3.2:latest
+# 2. Pull a tool-capable model
+ollama pull qwen2.5:latest
 
 # 3. Start llm-cli and switch to Ollama
 llm-cli
@@ -62,13 +54,26 @@ llm-cli
 # 4. (Optional) Switch to a different model
 /provider model <model-name>
 ```
-The default model is `llama3.2:latest`. Use `/provider model` to list available models and switch between them.
 
-#### Traditional Setup (Environment Variables)
+No `.env` file or environment variables required for Ollama. The default model is `llama3.2:latest`. Use `/provider model` to list available models and switch between them.
+
+**Tool-capable Ollama models** (recommended for file ops, shell commands, etc.):
+- `qwen2.5:7b` / `qwen2.5:14b`
+- `llama3.1:8b` / `llama3.1:70b`
+- `mistral:7b`
+
+Models without tool support (e.g. `gemma3n`, `deepseek-r1`) will automatically fall back to text-only conversation mode.
+
+### Environment Variables (Alternative)
 ```bash
-# Still supported for backward compatibility
+# Cloud providers
 export OPENAI_API_KEY="your-api-key"
 export ANTHROPIC_API_KEY="your-api-key"
+
+# Ollama (optional overrides)
+export OLLAMA_MODEL="qwen2.5:latest"
+export OLLAMA_BASE_URL="http://localhost:11434"
+
 llm-cli
 ```
 

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 = "65cf1981";
-    CLI_VERSION = "0.0.5";
+    GIT_COMMIT_INFO = "03a9161d";
+    CLI_VERSION = "0.0.7";
   }
 });
 
@@ -141926,13 +141926,14 @@ 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,
@@ -141942,13 +141943,15 @@ var init_ollama_provider = __esm({
         };
         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) {
           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();
@@ -141956,7 +141959,7 @@ var init_ollama_provider = __esm({
       }
       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,
@@ -141966,13 +141969,15 @@ var init_ollama_provider = __esm({
         };
         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) {
           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();
@@ -142021,6 +142026,24 @@ 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;
@@ -142114,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)
                 }
               });
             }
@@ -142173,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)
+                        }
                       });
                     }
                   }
@@ -142372,7 +142396,7 @@ function createContentGeneratorConfig(config, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.0.5";
+  const version2 = "0.0.7";
   const userAgent2 = `GeminiCLI/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -243939,8 +243963,8 @@ var init_providerManager = __esm({
               name: "Ollama (Local)",
               description: "Local models via Ollama",
               authType: "ollama-local",
-              requiredEnvVars: ["OLLAMA_MODEL"],
-              optionalEnvVars: ["OLLAMA_BASE_URL"],
+              requiredEnvVars: [],
+              optionalEnvVars: ["OLLAMA_MODEL", "OLLAMA_BASE_URL"],
               defaultModel: "llama3.2:latest",
               apiKeyFormat: "none",
               apiKeyUrl: "https://ollama.ai/",
@@ -274734,7 +274758,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.0.5";
+  return "0.0.7";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -274786,7 +274810,7 @@ init_open();
 import process30 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "37f235d7";
+var GIT_COMMIT_INFO2 = "03a9161d";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 init_dist3();

package/package.json

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