From f58af906b0d36260985ce55a85dfbeb7262beadf Mon Sep 17 00:00:00 2001
From: emilyjiji <92887308+emilyjiji@users.noreply.github.com>
Date: Wed, 13 Aug 2025 20:02:47 -0400
Subject: [PATCH 1/3] Add Ollama provider (--use-ollama) + config keys; disable
 tools when unsupported

---
 src/common/Configuration/KnownSettings.cs     | 97 +++++++++++--------
 src/cycod/ChatClient/ChatClientFactory.cs     | 50 +++++++++-
 src/cycod/ChatClient/FunctionCallingChat.cs   | 18 ++--
 .../CommandLine/CycoDevCommandLineOptions.cs  | 32 ++++--
 4 files changed, 142 insertions(+), 55 deletions(-)

diff --git a/src/common/Configuration/KnownSettings.cs b/src/common/Configuration/KnownSettings.cs
index d5e2c9249..a050f0cba 100644
--- a/src/common/Configuration/KnownSettings.cs
+++ b/src/common/Configuration/KnownSettings.cs
@@ -13,13 +13,13 @@ public static class KnownSettings
     // Anthropic settings
     public const string AnthropicApiKey = "Anthropic.ApiKey";
     public const string AnthropicModelName = "Anthropic.ModelName";
-    
+
     // AWS Bedrock settings
     public const string AWSBedrockAccessKey = "AWS.Bedrock.AccessKey";
     public const string AWSBedrockSecretKey = "AWS.Bedrock.SecretKey";
     public const string AWSBedrockRegion = "AWS.Bedrock.Region";
     public const string AWSBedrockModelId = "AWS.Bedrock.ModelId";
-    
+
     // Google Gemini settings
     public const string GoogleGeminiApiKey = "Google.Gemini.ApiKey";
     public const string GoogleGeminiModelId = "Google.Gemini.ModelId";
@@ -33,15 +33,19 @@ public static class KnownSettings
     public const string AzureOpenAIApiKey = "Azure.OpenAI.ApiKey";
     public const string AzureOpenAIEndpoint = "Azure.OpenAI.Endpoint";
     public const string AzureOpenAIChatDeployment = "Azure.OpenAI.ChatDeployment";
-    
+
     // OpenAI settings
     public const string OpenAIApiKey = "OpenAI.ApiKey";
     public const string OpenAIEndpoint = "OpenAI.Endpoint";
     public const string OpenAIChatModelName = "OpenAI.ChatModelName";
-    
+
+    //Ollama settings
+    public const string OllamaBaseUrl = "Ollama.BaseUrl";
+    public const string OllamaModelId = "Ollama.ModelId";
+
     // GitHub settings
     public const string GitHubToken = "GitHub.Token";
-    
+
     // Copilot settings
     public const string CopilotModelName = "Copilot.ModelName";
     public const string CopilotApiEndpoint = "Copilot.ApiEndpoint";
@@ -59,11 +63,11 @@ public static class KnownSettings
     public const string AppChatCompletionTimeout = "App.ChatCompletionTimeout";
     public const string AppAutoApprove = "App.AutoApprove";
     public const string AppAutoDeny = "App.AutoDeny";
-    
+
     #endregion
-    
+
     #region Secret Settings
-    
+
     /// <summary>
     /// Collection of known setting names that should be treated as secrets.
     /// </summary>
@@ -91,11 +95,11 @@ public static class KnownSettings
         // GitHub secrets
         GitHubToken,
     };
-    
+
     #endregion
-    
+
     #region Setting Format Mappings
-    
+
     /// <summary>
     /// Mapping from dot notation to environment variable format.
     /// </summary>
@@ -129,6 +133,10 @@ public static class KnownSettings
         { OpenAIApiKey, "OPENAI_API_KEY" },
         { OpenAIEndpoint, "OPENAI_ENDPOINT" },
         { OpenAIChatModelName, "OPENAI_CHAT_MODEL_NAME" },
+
+        //Ollama mappings
+        { OllamaBaseUrl, "OLLAMA_BASE_URL" },
+        { OllamaModelId, "OLLAMA_MODEL_ID" },
         
         // GitHub mappings
         { GitHubToken, "GITHUB_TOKEN" },
@@ -151,7 +159,7 @@ public static class KnownSettings
         { AppAutoApprove, "CYCOD_AUTO_APPROVE" },
         { AppAutoDeny, "CYCOD_AUTO_DENY" }
     };
-    
+
     /// <summary>
     /// Mapping from dot notation to CLI option format.
     /// </summary>
@@ -185,6 +193,10 @@ public static class KnownSettings
         { OpenAIApiKey, "--openai-api-key" },
         { OpenAIEndpoint, "--openai-endpoint" },
         { OpenAIChatModelName, "--openai-chat-model-name" },
+
+        // Ollama mappings
+        { OllamaBaseUrl, "--ollama-base-url" },
+        { OllamaModelId, "--ollama-model-id" },
         
         // GitHub mappings
         { GitHubToken, "--github-token" },
@@ -206,12 +218,12 @@ public static class KnownSettings
         { AppAutoApprove, "--auto-approve" },
         { AppAutoDeny, "--auto-deny" }
     };
-    
+
     /// <summary>
     /// Mapping from environment variable format to dot notation.
     /// </summary>
     private static readonly Dictionary<string, string> _envVarToDotMap;
-    
+
     /// <summary>
     /// Mapping from CLI option format to dot notation.
     /// </summary>
@@ -237,7 +249,7 @@ public static class KnownSettings
         AnthropicApiKey,
         AnthropicModelName
     };
-    
+
     /// <summary>
     /// Collection of settings for AWS Bedrock integration.
     /// </summary>
@@ -248,7 +260,7 @@ public static class KnownSettings
         AWSBedrockRegion,
         AWSBedrockModelId
     };
-    
+
     /// <summary>
     /// Collection of settings for Google Gemini integration.
     /// </summary>
@@ -257,7 +269,7 @@ public static class KnownSettings
         GoogleGeminiApiKey,
         GoogleGeminiModelId
     };
-    
+
     /// <summary>
     /// Collection of settings for Grok integration.
     /// </summary>
@@ -277,7 +289,7 @@ public static class KnownSettings
         AzureOpenAIEndpoint,
         AzureOpenAIChatDeployment
     };
-    
+
     /// <summary>
     /// Collection of settings for OpenAI integration.
     /// </summary>
@@ -287,7 +299,16 @@ public static class KnownSettings
         OpenAIEndpoint,
         OpenAIChatModelName
     };
-    
+
+    /// <summary>
+    /// Collection of settings for Ollama integration.
+    /// </summary>
+    public static readonly HashSet<string> OllamaSettings = new(StringComparer.OrdinalIgnoreCase)
+    {
+        OllamaBaseUrl,
+        OllamaModelId
+    };
+
     /// <summary>
     /// Collection of settings for GitHub integration.
     /// </summary>
@@ -295,7 +316,7 @@ public static class KnownSettings
     {
         GitHubToken
     };
-    
+
     /// <summary>
     /// Collection of settings for Copilot integration.
     /// </summary>
@@ -306,7 +327,7 @@ public static class KnownSettings
         CopilotIntegrationId,
         CopilotEditorVersion
     };
-    
+
     /// <summary>
     /// Collection of settings for application configuration.
     /// </summary>
@@ -323,16 +344,16 @@ public static class KnownSettings
         AppAutoApprove,
         AppAutoDeny
     };
-    
+
     #endregion
-    
+
     static KnownSettings()
     {
         // Initialize reverse mappings
         _envVarToDotMap = _dotToEnvVarMap.ToDictionary(kvp => kvp.Value, kvp => kvp.Key, StringComparer.OrdinalIgnoreCase);
         _cliOptionToDotMap = _dotToCLIOptionMap.ToDictionary(kvp => kvp.Value, kvp => kvp.Key, StringComparer.OrdinalIgnoreCase);
     }
-    
+
     /// <summary>
     /// Checks if the given key is a known setting.
     /// </summary>
@@ -345,7 +366,7 @@ public static bool IsKnown(string key)
         if (_cliOptionToDotMap.ContainsKey(key)) return true;
         return false;
     }
-    
+
     /// <summary>
     /// Checks if the given key is a secret value that should be obfuscated.
     /// </summary>
@@ -356,7 +377,7 @@ public static bool IsSecret(string key)
         var dotNotationKey = ToDotNotation(key);
         return _secretSettings.Contains(dotNotationKey);
     }
-    
+
     /// <summary>
     /// Gets all known setting names in dot notation format.
     /// </summary>
@@ -376,7 +397,7 @@ public static bool IsMultiValue(string key)
         var dotNotationKey = ToDotNotation(key);
         return _multiValueSettings.Contains(dotNotationKey, StringComparer.OrdinalIgnoreCase);
     }
-    
+
     /// <summary>
     /// Gets the canonical form of a known setting key.
     /// </summary>
@@ -418,7 +439,7 @@ public static string ToEnvironmentVariable(string key)
         // Otherwise, just return it
         return key;
     }
-    
+
     /// <summary>
     /// Converts a setting name to CLI option format.
     /// </summary>
@@ -427,20 +448,20 @@ public static string ToEnvironmentVariable(string key)
     public static string ToCLIOption(string key)
     {
         if (IsCLIOptionFormat(key)) return key;
-        
+
         // Try to map to a CLI option
         var dotNotationKey = ToDotNotation(key);
         if (_dotToCLIOptionMap.TryGetValue(dotNotationKey, out string? cliOption))
         {
             return cliOption;
         }
-        
+
         // Otherwise, use a general algorithm
         var parts = dotNotationKey.Split('.');
         var kebabParts = parts.Select(p => ToKebabCase(p));
         return "--" + string.Join("-", kebabParts).ToLowerInvariant();
     }
-    
+
     /// <summary>
     /// Converts a setting name to dot notation format.
     /// </summary>
@@ -456,7 +477,7 @@ public static string ToDotNotation(string key)
                 return dotNotation;
             }
         }
-        
+
         // If it's a CLI option format
         if (IsCLIOptionFormat(key))
         {
@@ -464,7 +485,7 @@ public static string ToDotNotation(string key)
             {
                 return dotNotation;
             }
-            
+
             // Remove leading -- and convert kebab-case to PascalCase with dots
             var trimmed = key.TrimStart('-');
             var parts = trimmed.Split('-');
@@ -475,13 +496,13 @@ public static string ToDotNotation(string key)
                     parts[i] = char.ToUpper(parts[i][0]) + parts[i].Substring(1).ToLower();
                 }
             }
-            
+
             return string.Join(".", parts);
         }
 
         return key;
     }
-    
+
     /// <summary>
     /// Determines if the given key is in environment variable format.
     /// </summary>
@@ -491,7 +512,7 @@ public static bool IsEnvironmentVariableFormat(string key)
     {
         return Regex.IsMatch(key, "^[A-Z0-9_]+$");
     }
-    
+
     /// <summary>
     /// Determines if the given key is in CLI option format.
     /// </summary>
@@ -501,7 +522,7 @@ public static bool IsCLIOptionFormat(string key)
     {
         return key.StartsWith("--");
     }
-    
+
     /// <summary>
     /// Converts a string from PascalCase to kebab-case.
     /// </summary>
@@ -511,7 +532,7 @@ private static string ToKebabCase(string input)
     {
         if (string.IsNullOrEmpty(input))
             return input;
-        
+
         // Insert a hyphen before each uppercase letter that follows a lowercase letter
         var result = Regex.Replace(input, "(?<!^)([A-Z])", "-$1");
         return result.ToLowerInvariant();
diff --git a/src/cycod/ChatClient/ChatClientFactory.cs b/src/cycod/ChatClient/ChatClientFactory.cs
index b4b65e292..d69c0e958 100644
--- a/src/cycod/ChatClient/ChatClientFactory.cs
+++ b/src/cycod/ChatClient/ChatClientFactory.cs
@@ -69,7 +69,7 @@ public static IChatClient CreateOpenAIChatClientWithApiKey()
         {
             ModelId = modelId
         };
-        
+
         ConsoleHelpers.WriteDebugLine("Using Google Gemini API credentials for authentication");
         return client;
     }
@@ -96,7 +96,7 @@ public static IChatClient CreateGrokChatClientWithApiKey()
         var regionEndpoint = RegionEndpoint.GetBySystemName(region);
         var runtime = new AmazonBedrockRuntimeClient(accessKey, secretKey, regionEndpoint);
         var chatClient = runtime.AsIChatClient();
-        
+
         options = new ChatOptions
         {
             ModelId = modelId,
@@ -108,6 +108,31 @@ public static IChatClient CreateGrokChatClientWithApiKey()
         return chatClient;
     }
 
+    public static IChatClient CreateOllamaChatClient(out ChatOptions? options)
+    {
+
+        var baseUrl = EnvironmentHelpers.FindEnvVar("OLLAMA_BASE_URL")
+                    ?? "http://localhost:11434/v1";
+        var modelId = EnvironmentHelpers.FindEnvVar("OLLAMA_MODEL_ID")
+                    ?? "gpt-oss:20b";
+
+        var chatClient = new OpenAI.Chat.ChatClient(
+            modelId,
+            new System.ClientModel.ApiKeyCredential("ollama-local"),
+            InitOpenAIClientOptions(baseUrl)
+        );
+
+        options = new ChatOptions
+        {
+            ModelId = modelId,
+            ToolMode = ChatToolMode.None
+        };
+
+        ConsoleHelpers.WriteDebugLine($"Using Ollama at {baseUrl} with model {modelId}");
+        return chatClient.AsIChatClient();
+    }
+
+
     public static IChatClient CreateCopilotChatClientWithGitHubToken()
     {
         var model = EnvironmentHelpers.FindEnvVar("COPILOT_MODEL_NAME") ?? "claude-sonnet-4";
@@ -170,13 +195,13 @@ public static IChatClient CreateCopilotChatClientWithGitHubToken()
             {
                 return CreateAnthropicChatClientWithApiKey(out options);
             }
-            else if ((preferredProvider == "aws" || preferredProvider == "bedrock" || preferredProvider == "aws-bedrock") && 
+            else if ((preferredProvider == "aws" || preferredProvider == "bedrock" || preferredProvider == "aws-bedrock") &&
                     !string.IsNullOrEmpty(EnvironmentHelpers.FindEnvVar("AWS_BEDROCK_ACCESS_KEY")) &&
                     !string.IsNullOrEmpty(EnvironmentHelpers.FindEnvVar("AWS_BEDROCK_SECRET_KEY")))
             {
                 return CreateAWSBedrockChatClient(out options);
             }
-            else if ((preferredProvider == "google" || preferredProvider == "gemini" || preferredProvider == "google-gemini") && 
+            else if ((preferredProvider == "google" || preferredProvider == "gemini" || preferredProvider == "google-gemini") &&
                     !string.IsNullOrEmpty(EnvironmentHelpers.FindEnvVar("GOOGLE_GEMINI_API_KEY")))
             {
                 return CreateGeminiChatClient(out options);
@@ -194,6 +219,10 @@ public static IChatClient CreateCopilotChatClientWithGitHubToken()
             {
                 return CreateOpenAIChatClientWithApiKey();
             }
+            else if (preferredProvider == "ollama")
+            {
+                return CreateOllamaChatClient(out options);
+            }
 
             // If preferred provider credentials aren't available, warn the user
             ConsoleHelpers.WriteWarning($"Preferred provider '{preferredProvider}' credentials not found. Falling back to default selection.");
@@ -244,6 +273,12 @@ public static IChatClient CreateCopilotChatClientWithGitHubToken()
             return CreateOpenAIChatClientWithApiKey();
         }
 
+        if (!string.IsNullOrEmpty(EnvironmentHelpers.FindEnvVar("OLLAMA_BASE_URL")) || !string.IsNullOrEmpty(EnvironmentHelpers.FindEnvVar("OLLAMA_MODEL_ID")))
+        {
+            return CreateOllamaChatClient(out options);
+        }
+
+
         return null;
     }
 
@@ -296,7 +331,12 @@ public static IChatClient CreateChatClient(out ChatOptions? options)
                     To use OpenAI, please set:
                     - OPENAI_API_KEY
                     - OPENAI_ENDPOINT (optional)
-                    - OPENAI_CHAT_MODEL_NAME (optional)"
+                    - OPENAI_CHAT_MODEL_NAME (optional)
+
+                    To use Ollama (OpenAI-compatible local server), please set:
+                    - OLLAMA_BASE_URL (optional, default: http://localhost:11434/v1)
+                    - OLLAMA_MODEL_ID (optional, default: gpt-oss:20b)
+                    Tip for low-spec dev boxes: set OLLAMA_MODEL_ID=llama3:8b"
                 .Split(new[] { '\n' })
                 .Select(line => line.Trim()));
 
diff --git a/src/cycod/ChatClient/FunctionCallingChat.cs b/src/cycod/ChatClient/FunctionCallingChat.cs
index 732f8a975..e9280fa36 100644
--- a/src/cycod/ChatClient/FunctionCallingChat.cs
+++ b/src/cycod/ChatClient/FunctionCallingChat.cs
@@ -13,6 +13,8 @@ public FunctionCallingChat(IChatClient chatClient, string systemPrompt, Function
             ? chatClient.AsBuilder().UseFunctionInvocation().Build()
             : chatClient;
 
+        var toolsDisabled = (options?.ToolMode ?? ChatToolMode.Auto) == ChatToolMode.None;
+
         var tools = _functionFactory.GetAITools().ToList();
         ConsoleHelpers.WriteDebugLine($"FunctionCallingChat: Found {tools.Count} tools in FunctionFactory");
 
@@ -20,8 +22,8 @@ public FunctionCallingChat(IChatClient chatClient, string systemPrompt, Function
         _options = new ChatOptions()
         {
             ModelId = options?.ModelId,
-            ToolMode = options?.ToolMode,
-            Tools = tools,
+            ToolMode = toolsDisabled ? ChatToolMode.None : (options?.ToolMode ?? ChatToolMode.Auto),
+            Tools = toolsDisabled ? new List<AITool>() : tools,
             MaxOutputTokens = maxOutputTokens.HasValue
                 ? maxOutputTokens.Value
                 : options?.MaxOutputTokens,
@@ -51,7 +53,7 @@ public void AddUserMessage(string userMessage, int maxPromptTokenTarget = 0, int
             maxPromptTokenTarget: maxPromptTokenTarget,
             maxChatTokenTarget: maxChatTokenTarget);
     }
-    
+
     public void AddUserMessages(IEnumerable<string> userMessages, int maxPromptTokenTarget = 0, int maxChatTokenTarget = 0)
     {
         foreach (var userMessage in userMessages)
@@ -109,12 +111,16 @@ public async Task<string> CompleteChatStreamingAsync(
         messageCallback?.Invoke(_messages);
 
         var contentToReturn = string.Empty;
+        var toolsDisabled = (_options.ToolMode ?? ChatToolMode.Auto) == ChatToolMode.None;
         while (true)
         {
             var responseContent = string.Empty;
             await foreach (var update in _chatClient.GetStreamingResponseAsync(_messages, _options))
             {
-                _functionCallDetector.CheckForFunctionCall(update);
+                if (!toolsDisabled)
+                {
+                    _functionCallDetector.CheckForFunctionCall(update);
+                }
 
                 var content = string.Join("", update.Contents
                     .Where(c => c is TextContent)
@@ -133,7 +139,7 @@ public async Task<string> CompleteChatStreamingAsync(
                 streamingCallback?.Invoke(update);
             }
 
-            if (TryCallFunctions(responseContent, approveFunctionCall, functionCallCallback, messageCallback))
+            if (!toolsDisabled && TryCallFunctions(responseContent, approveFunctionCall, functionCallCallback, messageCallback))
             {
                 _functionCallDetector.Clear();
                 continue;
@@ -150,7 +156,7 @@ private bool TryCallFunctions(string responseContent, Func<string, string?, bool
     {
         var noFunctionsToCall = !_functionCallDetector.HasFunctionCalls();
         if (noFunctionsToCall) return false;
-        
+
         var readyToCallFunctionCalls = _functionCallDetector.GetReadyToCallFunctionCalls();
 
         var emptyResponseContent = string.IsNullOrEmpty(responseContent);
diff --git a/src/cycod/CommandLine/CycoDevCommandLineOptions.cs b/src/cycod/CommandLine/CycoDevCommandLineOptions.cs
index e7af0a5e7..4a30818fb 100644
--- a/src/cycod/CommandLine/CycoDevCommandLineOptions.cs
+++ b/src/cycod/CommandLine/CycoDevCommandLineOptions.cs
@@ -14,7 +14,7 @@ public static bool Parse(string[] args, out CommandLineOptions? options, out Com
         if (parsed && options.Commands.Count == 1)
         {
             var command = options.Commands.FirstOrDefault();
-            var oneChatCommandWithNoInput =  command is ChatCommand chatCommand && chatCommand.InputInstructions.Count == 0;
+            var oneChatCommandWithNoInput = command is ChatCommand chatCommand && chatCommand.InputInstructions.Count == 0;
             var inOrOutRedirected = Console.IsInputRedirected || Console.IsOutputRedirected;
             var implictlyUseStdIn = oneChatCommandWithNoInput && inOrOutRedirected;
             if (implictlyUseStdIn)
@@ -41,7 +41,7 @@ override protected string PeekCommandName(string[] args, int i)
 
     override protected bool CheckPartialCommandNeedsHelp(string commandName)
     {
-	    return commandName == "alias" ||
+        return commandName == "alias" ||
                commandName == "config" ||
                commandName == "github" ||
                commandName == "mcp" ||
@@ -83,16 +83,16 @@ override protected bool CheckPartialCommandNeedsHelp(string commandName)
     }
 
     override protected bool TryParseOtherCommandOptions(Command? command, string[] args, ref int i, string arg)
-	{
-		return TryParseChatCommandOptions(command as ChatCommand, args, ref i, arg) ||
+    {
+        return TryParseChatCommandOptions(command as ChatCommand, args, ref i, arg) ||
                TryParseGitHubLoginCommandOptions(command as GitHubLoginCommand, args, ref i, arg) ||
                TryParseConfigCommandOptions(command as ConfigBaseCommand, args, ref i, arg) ||
                TryParseAliasCommandOptions(command as AliasBaseCommand, args, ref i, arg) ||
                TryParsePromptCommandOptions(command as PromptBaseCommand, args, ref i, arg) ||
                TryParseMcpCommandOptions(command as McpBaseCommand, args, ref i, arg);
     }
-	
-	override protected bool TryParseOtherCommandArg(Command? command, string arg)
+
+    override protected bool TryParseOtherCommandArg(Command? command, string arg)
     {
         var parsedOption = false;
 
@@ -606,6 +606,26 @@ private bool TryParseChatCommandOptions(ChatCommand? command, string[] args, ref
         {
             ConfigStore.Instance.SetFromCommandLine(KnownSettings.AppPreferredProvider, "openai");
         }
+        else if (arg == "--use-ollama")
+        {
+            ConfigStore.Instance.SetFromCommandLine(KnownSettings.AppPreferredProvider, "ollama");
+        }
+        else if (arg == "--ollama-base-url")
+        {
+            var max1Arg = GetInputOptionArgs(i + 1, args, max: 1);
+            var url = ValidateString(arg, max1Arg.FirstOrDefault(), "Ollama base URL");
+            if (url != null)
+                ConfigStore.Instance.SetFromCommandLine(KnownSettings.OllamaBaseUrl, url);
+            i += max1Arg.Count();
+        }
+        else if (arg == "--ollama-model-id")
+        {
+            var max1Arg = GetInputOptionArgs(i + 1, args, max: 1);
+            var modelId = ValidateString(arg, max1Arg.FirstOrDefault(), "Ollama model id");
+            if (modelId != null)
+                ConfigStore.Instance.SetFromCommandLine(KnownSettings.OllamaModelId, modelId);
+            i += max1Arg.Count();
+        }
         else if (arg == "--use-copilot")
         {
             ConfigStore.Instance.SetFromCommandLine(KnownSettings.AppPreferredProvider, "copilot");

From e5e702527146c01be09d3fcd010b7ec01f7cdb0d Mon Sep 17 00:00:00 2001
From: emilyjiji <92887308+emilyjiji@users.noreply.github.com>
Date: Mon, 25 Aug 2025 20:43:35 -0400
Subject: [PATCH 2/3] readme changes

---
 README.md                               |  2 +
 src/cycod/assets/help/configuration.txt |  1 +
 src/cycod/assets/help/options.txt       |  5 ++
 src/cycod/assets/help/provider.txt      |  6 ++-
 src/cycod/assets/help/settings.txt      |  2 +
 src/cycod/assets/help/use ollama.txt    | 70 +++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 src/cycod/assets/help/use ollama.txt

diff --git a/README.md b/README.md
index 99145552d..a9573a24b 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ CycoD is a command-line interface (CLI) application that provides a chat-based i
   - Run shell commands (Bash, CMD, PowerShell) with persistent sessions
   - Manipulate files (view, create, edit, replace text)
   - Access date and time information
+  - **GUI Interactions** (Windows only): Show dialogs for user input, file selection, and notifications
 - **Comprehensive Configuration System**: 
   - Multiple configuration scopes (global, user, local)
   - Profile support for different configurations
@@ -177,6 +178,7 @@ For more detailed documentation, see:
 - [Getting Started](docs/getting-started.md)
 - [Command Line Options](docs/cli-options.md)
 - [Function Calling](docs/function-calling.md)
+- [GUI Functions](docs/gui-functions.md) - Windows GUI interaction functions
 - [Creating Aliases](docs/aliases.md)
 - [Chat History](docs/chat-history.md)
 - [Slash Commands](#chat-commands) - Special commands during chat sessions
diff --git a/src/cycod/assets/help/configuration.txt b/src/cycod/assets/help/configuration.txt
index c5544dba9..ee6a88365 100644
--- a/src/cycod/assets/help/configuration.txt
+++ b/src/cycod/assets/help/configuration.txt
@@ -136,5 +136,6 @@ SEE ALSO
   cycod help use gemini
   cycod help use grok
   cycod help use openai
+  cycod help use ollama
   cycod help function calls
   cycod help timeouts
\ No newline at end of file
diff --git a/src/cycod/assets/help/options.txt b/src/cycod/assets/help/options.txt
index f2efc67c1..318345ad7 100644
--- a/src/cycod/assets/help/options.txt
+++ b/src/cycod/assets/help/options.txt
@@ -52,6 +52,7 @@ USAGE: cycod [...]
     --use-gemini                          Prefer use of Google Gemini
     --use-grok                            Prefer use of Grok (x.ai)
     --use-openai                          Prefer use of OpenAI API as the chat provider
+    --use-ollama                          Prefer use of a local Ollama server (OpenAI-compatible)
 
   ANTHROPIC OPTIONS                       (see: cycod help use anthropic)
     --anthropic-api-key KEY               Use a specific API key for Anthropic
@@ -81,6 +82,10 @@ USAGE: cycod [...]
     --openai-api-key KEY                  Use a specific API key
     --openai-chat-model-name NAME         Use a specific chat model (default: gpt-4o)
 
+  OLLAMA OPTIONS                          (see: cycod help use ollama)
+  --ollama-base-url URL               Use a specific API base URL (default: http://localhost:11434/v1)
+  --ollama-model-id ID                Use a specific model ID (e.g., llama3:8b, qwen2.5:0.5b)
+
   COPILOT OPTIONS                         (see: cycod help use github copilot)
     --copilot-model-name NAME             Use a specific model by name (default: claude-sonnet-4)
     --copilot-api-endpoint URL            Use a specific API endpoint (default: https://api.githubcopilot.com)
diff --git a/src/cycod/assets/help/provider.txt b/src/cycod/assets/help/provider.txt
index 2c36eec9e..f66b1b4b1 100644
--- a/src/cycod/assets/help/provider.txt
+++ b/src/cycod/assets/help/provider.txt
@@ -9,6 +9,8 @@ CycoD supports multiple AI providers for chat functionality:
 - Google Gemini
 - Grok (x.ai)
 - OpenAI API
+- GitHub Copilot
+- Ollama (local OpenAI-compatible)
 
 ## Provider Selection Flags
 
@@ -22,6 +24,7 @@ Use these flags to explicitly select which provider to use:
 --use-gemini           Use Google Gemini
 --use-grok             Use Grok (x.ai)
 --use-openai           Use OpenAI API
+--use-ollama           Use local Ollama (OpenAI-compatible)
 ```
 
 ## Named Profiles
@@ -69,4 +72,5 @@ CYCOD_PREFERRED_PROVIDER=azure-openai
   cycod help use bedrock
   cycod help use gemini
   cycod help use grok
-  cycod help use openai
\ No newline at end of file
+  cycod help use openai
+  cycod help use ollama
\ No newline at end of file
diff --git a/src/cycod/assets/help/settings.txt b/src/cycod/assets/help/settings.txt
index de35f41dc..a0c34b325 100644
--- a/src/cycod/assets/help/settings.txt
+++ b/src/cycod/assets/help/settings.txt
@@ -238,6 +238,7 @@ USE APP SETTINGS
       cycod config set App.PreferredProvider gemini
       cycod config set App.PreferredProvider grok
       cycod config set App.PreferredProvider openai
+      cycod config set App.PreferredProvider ollama
 
     EXAMPLE 2: Set preferred AI provider via environment variable
 
@@ -259,6 +260,7 @@ USE APP SETTINGS
       cycod chat --use-google
       cycod chat --use-grok
       cycod chat --use-openai
+      cycod chat --use-ollama
 
 SEE ALSO
 
diff --git a/src/cycod/assets/help/use ollama.txt b/src/cycod/assets/help/use ollama.txt
new file mode 100644
index 000000000..99d6dbfa6
--- /dev/null
+++ b/src/cycod/assets/help/use ollama.txt	
@@ -0,0 +1,70 @@
+USE OLLAMA
+
+  AUTHENTICATION
+
+    No API key required for local Ollama.
+
+  QUICK START
+
+    EXAMPLE 1: Pull a tiny model locally (Ollama CLI)
+      ollama pull qwen2.5:0.5b
+
+    EXAMPLE 2: Run a quick test with CycoD
+      cycod chat --use-ollama -q "hello"
+
+    EXAMPLE 3: Point to a non-default server
+      cycod chat --use-ollama --ollama-base-url http://localhost:11434/v1 -q "hi"
+
+  MODEL SELECTION
+
+    EXAMPLE 1: Set model via config
+      cycod config set Ollama.ModelId qwen2.5:0.5b
+      cycod config set Ollama.ModelId llama3:8b --local
+      cycod config set Ollama.ModelId qwen2.5:7b --user
+
+    EXAMPLE 2: Set model via environment variable
+      Set OLLAMA_MODEL_ID environment variable
+
+    EXAMPLE 3: Supply model via command line
+      cycod chat --use-ollama --ollama-model-id qwen2.5:0.5b -q "hello"
+
+  POPULAR MODELS
+
+    EXAMPLE 1: Small (good for low-spec dev boxes)
+      ollama pull qwen2.5:0.5b
+      cycod chat --use-ollama --ollama-model-id qwen2.5:0.5b -q "hello"
+
+    EXAMPLE 2: Mid-size (quality vs speed)
+      ollama pull llama3:8b
+      cycod chat --use-ollama --ollama-model-id llama3:8b -q "summarize why Rust uses a borrow checker"
+
+    EXAMPLE 3: GPT-OSS (larger; needs more memory)
+      ollama pull gpt-oss:20b
+      cycod chat --use-ollama --ollama-model-id gpt-oss:20b -q "explain transformers in simple terms"
+
+  API ENDPOINT (BASE URL)
+
+    EXAMPLE 1: Set base URL via config
+      cycod config set Ollama.BaseUrl http://localhost:11434/v1
+      cycod config set Ollama.BaseUrl http://127.0.0.1:11434/v1 --local
+      cycod config set Ollama.BaseUrl http://my-host:11434/v1 --user
+
+    EXAMPLE 2: Set base URL via environment variable
+      Set OLLAMA_BASE_URL environment variable (default: http://localhost:11434/v1)
+
+    EXAMPLE 3: Supply base URL via command line
+      cycod chat --use-ollama --ollama-base-url http://localhost:11434/v1 -q "hello"
+
+  FUNCTION CALLING
+
+    In this release, CycoD uses Ollama for chat completion only.
+    Function tools are not enabled with Ollama.
+
+  TROUBLESHOOTING
+
+    - model "X" not found
+        Run:  ollama pull <model-id>
+
+    - out of memory / slow generation
+        Try a smaller model (e.g., qwen2.5:0.5b or llama3:8b), close other GPU apps,
+        or use a quantized/compact variant if available.

From 08ec7bb190d9176bc5ab2bf08c98dc136818ce74 Mon Sep 17 00:00:00 2001
From: emilyjiji <92887308+emilyjiji@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:40:56 -0400
Subject: [PATCH 3/3] revert unrelated code

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index a9573a24b..99145552d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ CycoD is a command-line interface (CLI) application that provides a chat-based i
   - Run shell commands (Bash, CMD, PowerShell) with persistent sessions
   - Manipulate files (view, create, edit, replace text)
   - Access date and time information
-  - **GUI Interactions** (Windows only): Show dialogs for user input, file selection, and notifications
 - **Comprehensive Configuration System**: 
   - Multiple configuration scopes (global, user, local)
   - Profile support for different configurations
@@ -178,7 +177,6 @@ For more detailed documentation, see:
 - [Getting Started](docs/getting-started.md)
 - [Command Line Options](docs/cli-options.md)
 - [Function Calling](docs/function-calling.md)
-- [GUI Functions](docs/gui-functions.md) - Windows GUI interaction functions
 - [Creating Aliases](docs/aliases.md)
 - [Chat History](docs/chat-history.md)
 - [Slash Commands](#chat-commands) - Special commands during chat sessions