git-coco 0.17.0 → 0.18.1

package/dist/index.d.ts

@@ -11,9 +11,10 @@ import { Color } from 'chalk';
 import { TiktokenModel as TiktokenModel$1 } from 'tiktoken';
 
 type LLMProvider = 'openai' | 'ollama' | 'anthropic';
+type OpenAIModel = TiktokenModel | 'gpt-4o-mini' | 'gpt-4o' | 'gpt-4.1' | 'gpt-4.1-mini' | 'gpt-4.1-nano';
 type AnthropicModel = 'claude-sonnet-4-0' | 'claude-3-7-sonnet-latest' | 'claude-3-5-haiku-latest' | 'claude-3-5-sonnet-latest' | 'claude-3-5-sonnet-20241022' | 'claude-3-5-sonnet-20240620' | 'claude-3-opus-20240229' | 'claude-3-sonnet-20240229' | 'claude-3-haiku-20240307';
 type OllamaModel = 'deepseek-r1:1.5b' | 'deepseek-r1:8b' | 'deepseek-r1:32b' | 'codegemma:2b' | 'codegemma:7b-code' | 'codegemma' | 'codellama:13b' | 'codellama:34b' | 'codellama:70b' | 'codellama:7b' | 'codellama:instruct' | 'codellama:latest' | 'codellama' | 'gemma:2b' | 'gemma:7b' | 'gemma:latest' | 'gemma' | 'llama2:13b' | 'llama2:70b' | 'llama2:chat' | 'llama2:latest' | 'llama2:text' | 'llama2' | 'llama3:70b-text' | 'llama3:70b' | 'llama3:latest' | 'llama3:text' | 'llama3.1:70b' | 'llama3.1:8b' | 'llama3.1:latest' | 'llama3.2' | 'llama3.2:latest' | 'llama3.2:1b' | 'llama3.2:3b' | 'llama3' | 'llava-llama3:latest' | 'dolphin-llama3:latest' | 'dolphin-llama3:8b' | 'dolphin-llama3:70b' | 'mistral:7b' | 'mistral:latest' | 'mistral:text' | 'mistral' | 'phi3:14b' | 'phi3:3.8b' | 'phi3:instruct' | 'phi3:medium-128k' | 'phi3:medium-4k' | 'phi3:medium' | 'phi3' | 'qwen2:0.5b' | 'qwen2:1.5b' | 'qwen2:72b-text' | 'qwen2:72b' | 'qwen2' | 'qwen2.5-coder:latest' | 'qwen2.5-coder:0.5b' | 'qwen2.5-coder:1.5b' | 'qwen2.5-coder:3b' | 'qwen2.5-coder:7b' | 'qwen2.5-coder:14b' | 'qwen2.5-coder:32b';
-type LLMModel = TiktokenModel | OllamaModel | AnthropicModel;
+type LLMModel = OpenAIModel | OllamaModel | AnthropicModel;
 type BaseLLMService = {
     provider: LLMProvider;
     model: LLMModel;
@@ -68,7 +69,7 @@ type OpenAIFields = Partial<OpenAIInput> & BaseLLMParams;
 type OllamaFields = Partial<OllamaInput> & BaseLLMParams;
 type OpenAILLMService = BaseLLMService & {
     provider: 'openai';
-    model: TiktokenModel;
+    model: OpenAIModel;
     fields?: OpenAIFields;
 };
 type OllamaLLMService = BaseLLMService & {

package/dist/index.esm.mjs

@@ -46,7 +46,7 @@ import * as readline from 'readline';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.17.0";
+const BUILD_VERSION = "0.18.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -345,7 +345,7 @@ function getDefaultServiceApiKey(config) {
 }
 const DEFAULT_OPENAI_LLM_SERVICE = {
     provider: 'openai',
-    model: 'gpt-4o',
+    model: 'gpt-4o-mini',
     tokenLimit: 2024,
     temperature: 0.32,
     authentication: {
@@ -454,14 +454,29 @@ const CONFIG_KEYS = Object.keys({
  **/
 function loadEnvConfig(config) {
     const envConfig = {};
-    const envKeys = [...CONFIG_KEYS, 'COCO_SERVICE_PROVIDER', 'COCO_SERVICE_MODEL', 'OPEN_AI_KEY'];
+    const envKeys = [
+        ...CONFIG_KEYS,
+        'COCO_SERVICE_PROVIDER',
+        'COCO_SERVICE_MODEL',
+        'OPEN_AI_KEY',
+        'COCO_SERVICE_ENDPOINT',
+        'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT',
+        'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES',
+        'COCO_SERVICE_FIELDS',
+    ];
     envKeys.forEach((key) => {
         const envVarName = toEnvVarName(key);
         const envValue = parseEnvValue(key, process.env[envVarName]);
         if (envValue === undefined) {
             return;
         }
-        if (key === 'COCO_SERVICE_PROVIDER' || key === 'COCO_SERVICE_MODEL' || key === 'OPEN_AI_KEY') {
+        if (key === 'COCO_SERVICE_PROVIDER' ||
+            key === 'COCO_SERVICE_MODEL' ||
+            key === 'OPEN_AI_KEY' ||
+            key === 'COCO_SERVICE_ENDPOINT' ||
+            key === 'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT' ||
+            key === 'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES' ||
+            key === 'COCO_SERVICE_FIELDS') {
             // NOTE: We want to ensure that the service object is always defined
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -488,9 +503,28 @@ function handleServiceEnvVar(service, key, value) {
             break;
         case 'OPEN_AI_KEY':
             if (service.provider === 'openai') {
-                service.fields = { apiKey: value };
+                service.authentication = {
+                    type: 'APIKey',
+                    credentials: {
+                        apiKey: value,
+                    },
+                };
             }
             break;
+        case 'COCO_SERVICE_ENDPOINT':
+            if (service.provider === 'ollama') {
+                service.endpoint = value;
+            }
+            break;
+        case 'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT':
+            service.requestOptions = { ...service.requestOptions, timeout: value };
+            break;
+        case 'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES':
+            service.requestOptions = { ...service.requestOptions, maxRetries: value };
+            break;
+        case 'COCO_SERVICE_FIELDS':
+            service.fields = value;
+            break;
     }
 }
 function parseEnvValue(key, value) {
@@ -509,6 +543,9 @@ function parseEnvValue(key, value) {
         // Handle number values
         case typeof value === 'string' && !isNaN(Number(value)):
             return Number(value);
+        // Handle JSON strings
+        case typeof value === 'string' && value.startsWith('{'):
+            return JSON.parse(value);
         default:
             return value;
     }
@@ -522,32 +559,40 @@ function toEnvVarName(key) {
     }
     return `COCO_${key.replace(/([A-Z])/g, '_$1').toLocaleUpperCase()}`;
 }
-function formatEnvValue(value) {
-    if (typeof value === 'number') {
-        return `${value}`;
-    }
-    else if (Array.isArray(value)) {
-        return `${value.join(',')}`;
-    }
-    else if (typeof value === 'string') {
-        // Escape newlines and tabs in strings
-        return `${value.replace(/\n/g, '\\n').replace(/\t/g, '\\t')}`;
+const flattenObject = (obj, prefix = '') => {
+    let flattened = {};
+    for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            const propName = prefix ? `${prefix}_${key}` : key;
+            const value = obj[key];
+            // Skip undefined or null values
+            if (value === undefined || value === null) {
+                continue;
+            }
+            if (typeof value === 'object' && !Array.isArray(value)) {
+                // Handle nested objects, but specifically handle 'fields' as JSON string
+                if (key === 'fields') {
+                    flattened[propName.toUpperCase()] = JSON.stringify(value);
+                }
+                else {
+                    flattened = { ...flattened, ...flattenObject(value, propName) };
+                }
+            }
+            else {
+                // For primitive types (string, number, boolean, symbol, bigint) and arrays
+                flattened[propName.toUpperCase()] = String(value);
+            }
+        }
     }
-    return `${value}`;
-}
+    return flattened;
+};
 const appendToEnvFile = async (filePath, config) => {
     const getNewContent = async () => {
-        return Object.entries(config)
+        const flattenedConfig = flattenObject(config);
+        return Object.entries(flattenedConfig)
             .map(([key, value]) => {
-            if (key === 'service') {
-                const service = value;
-                return `${service.provider ? `COCO_SERVICE_PROVIDER=${service.provider}` : ''}\n${service.model ? `COCO_SERVICE_MODEL=${service.model}` : ''}\n${service.authentication.type === 'APIKey'
-                    ? `OPEN_AI_KEY=${service.authentication.credentials.apiKey}`
-                    : ''}`;
-            }
             const envVarName = toEnvVarName(key);
-            const envValue = formatEnvValue(value);
-            return `${envVarName}=${envValue}`;
+            return `${envVarName}=${value}`;
         })
             .join('\n');
     };
@@ -571,22 +616,31 @@ function loadGitConfig(config) {
     if (fs.existsSync(gitConfigPath)) {
         const gitConfigRaw = fs.readFileSync(gitConfigPath, 'utf-8');
         const gitConfigParsed = ini.parse(gitConfigRaw);
-        const gitConfigServiceObject = gitConfigParsed.coco?.service;
         let service = config.service;
-        if (gitConfigServiceObject) {
-            const gitServiceConfig = JSON.parse(gitConfigServiceObject);
-            service = gitServiceConfig || config?.service;
+        if (gitConfigParsed.coco) {
+            service = {
+                provider: gitConfigParsed.coco?.serviceProvider,
+                model: gitConfigParsed.coco?.serviceModel,
+                authentication: {
+                    type: 'APIKey',
+                    credentials: {
+                        apiKey: gitConfigParsed.coco?.serviceApiKey,
+                    },
+                },
+                requestOptions: {
+                    timeout: Number(gitConfigParsed.coco?.serviceRequestOptionsTimeout),
+                    maxRetries: Number(gitConfigParsed.coco?.serviceRequestOptionsMaxRetries),
+                },
+                endpoint: gitConfigParsed.coco?.serviceEndpoint,
+                fields: gitConfigParsed.coco?.serviceFields
+                    ? JSON.parse(gitConfigParsed.coco?.serviceFields)
+                    : undefined,
+            };
         }
         config = {
             ...config,
+            ...gitConfigParsed.coco,
             service: service,
-            prompt: gitConfigParsed.coco?.prompt || config.prompt,
-            mode: gitConfigParsed.coco?.mode || config.mode,
-            summarizePrompt: gitConfigParsed.coco?.summarizePrompt || config.summarizePrompt,
-            ignoredFiles: gitConfigParsed.coco?.ignoredFiles || config.ignoredFiles,
-            ignoredExtensions: gitConfigParsed.coco?.ignoredExtensions || config.ignoredExtensions,
-            defaultBranch: gitConfigParsed.coco?.defaultBranch || config.defaultBranch,
-            verbose: gitConfigParsed.coco?.verbose || config.verbose,
         };
     }
     return removeUndefined(config);
@@ -606,9 +660,28 @@ const appendToGitConfig = async (filePath, config) => {
         const contentLines = [header];
         for (const key in config) {
             const value = config[key];
-            if (typeof value === 'object') {
-                // Serialize object to JSON string
-                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            if (key === 'service') {
+                const service = value;
+                contentLines.push(`	serviceProvider = ${service.provider}`);
+                contentLines.push(`	serviceModel = ${service.model}`);
+                if (service.authentication.type === 'APIKey') {
+                    contentLines.push(`	serviceApiKey = ${service.authentication.credentials.apiKey}`);
+                }
+                if (service.requestOptions?.timeout) {
+                    contentLines.push(`	serviceRequestOptionsTimeout = ${service.requestOptions.timeout}`);
+                }
+                if (service.requestOptions?.maxRetries) {
+                    contentLines.push(`	serviceRequestOptionsMaxRetries = ${service.requestOptions.maxRetries}`);
+                }
+                if (service.provider === 'ollama') {
+                    const ollamaService = service;
+                    if (ollamaService.endpoint) {
+                        contentLines.push(`	serviceEndpoint = ${ollamaService.endpoint}`);
+                    }
+                }
+                if (service.fields) {
+                    contentLines.push(`	serviceFields = ${JSON.stringify(service.fields)}`);
+                }
             }
             else if (typeof value === 'string' && value.includes('\n')) {
                 // Wrap strings with new lines in quotes
@@ -1062,65 +1135,7 @@ const schema$1 = {
         "LLMModel": {
             "anyOf": [
                 {
-                    "type": "string",
-                    "enum": [
-                        "davinci-002",
-                        "babbage-002",
-                        "text-davinci-003",
-                        "text-davinci-002",
-                        "text-davinci-001",
-                        "text-curie-001",
-                        "text-babbage-001",
-                        "text-ada-001",
-                        "davinci",
-                        "curie",
-                        "babbage",
-                        "ada",
-                        "code-davinci-002",
-                        "code-davinci-001",
-                        "code-cushman-002",
-                        "code-cushman-001",
-                        "davinci-codex",
-                        "cushman-codex",
-                        "text-davinci-edit-001",
-                        "code-davinci-edit-001",
-                        "text-embedding-ada-002",
-                        "text-similarity-davinci-001",
-                        "text-similarity-curie-001",
-                        "text-similarity-babbage-001",
-                        "text-similarity-ada-001",
-                        "text-search-davinci-doc-001",
-                        "text-search-curie-doc-001",
-                        "text-search-babbage-doc-001",
-                        "text-search-ada-doc-001",
-                        "code-search-babbage-code-001",
-                        "code-search-ada-code-001",
-                        "gpt2",
-                        "gpt-3.5-turbo",
-                        "gpt-35-turbo",
-                        "gpt-3.5-turbo-0301",
-                        "gpt-3.5-turbo-0613",
-                        "gpt-3.5-turbo-1106",
-                        "gpt-3.5-turbo-0125",
-                        "gpt-3.5-turbo-16k",
-                        "gpt-3.5-turbo-16k-0613",
-                        "gpt-3.5-turbo-instruct",
-                        "gpt-3.5-turbo-instruct-0914",
-                        "gpt-4",
-                        "gpt-4-0314",
-                        "gpt-4-0613",
-                        "gpt-4-32k",
-                        "gpt-4-32k-0314",
-                        "gpt-4-32k-0613",
-                        "gpt-4-turbo",
-                        "gpt-4-turbo-2024-04-09",
-                        "gpt-4-turbo-preview",
-                        "gpt-4-1106-preview",
-                        "gpt-4-0125-preview",
-                        "gpt-4-vision-preview",
-                        "gpt-4o",
-                        "gpt-4o-2024-05-13"
-                    ]
+                    "$ref": "#/definitions/OpenAIModel"
                 },
                 {
                     "$ref": "#/definitions/OllamaModel"
@@ -1130,6 +1145,71 @@ const schema$1 = {
                 }
             ]
         },
+        "OpenAIModel": {
+            "type": "string",
+            "enum": [
+                "davinci-002",
+                "babbage-002",
+                "text-davinci-003",
+                "text-davinci-002",
+                "text-davinci-001",
+                "text-curie-001",
+                "text-babbage-001",
+                "text-ada-001",
+                "davinci",
+                "curie",
+                "babbage",
+                "ada",
+                "code-davinci-002",
+                "code-davinci-001",
+                "code-cushman-002",
+                "code-cushman-001",
+                "davinci-codex",
+                "cushman-codex",
+                "text-davinci-edit-001",
+                "code-davinci-edit-001",
+                "text-embedding-ada-002",
+                "text-similarity-davinci-001",
+                "text-similarity-curie-001",
+                "text-similarity-babbage-001",
+                "text-similarity-ada-001",
+                "text-search-davinci-doc-001",
+                "text-search-curie-doc-001",
+                "text-search-babbage-doc-001",
+                "text-search-ada-doc-001",
+                "code-search-babbage-code-001",
+                "code-search-ada-code-001",
+                "gpt2",
+                "gpt-3.5-turbo",
+                "gpt-35-turbo",
+                "gpt-3.5-turbo-0301",
+                "gpt-3.5-turbo-0613",
+                "gpt-3.5-turbo-1106",
+                "gpt-3.5-turbo-0125",
+                "gpt-3.5-turbo-16k",
+                "gpt-3.5-turbo-16k-0613",
+                "gpt-3.5-turbo-instruct",
+                "gpt-3.5-turbo-instruct-0914",
+                "gpt-4",
+                "gpt-4-0314",
+                "gpt-4-0613",
+                "gpt-4-32k",
+                "gpt-4-32k-0314",
+                "gpt-4-32k-0613",
+                "gpt-4-turbo",
+                "gpt-4-turbo-2024-04-09",
+                "gpt-4-turbo-preview",
+                "gpt-4-1106-preview",
+                "gpt-4-0125-preview",
+                "gpt-4-vision-preview",
+                "gpt-4o",
+                "gpt-4o-2024-05-13",
+                "gpt-4o-mini",
+                "gpt-4.1",
+                "gpt-4.1-mini",
+                "gpt-4.1-nano"
+            ]
+        },
         "OllamaModel": {
             "type": "string",
             "enum": [
@@ -6046,7 +6126,6 @@ function getPrompt({ template, variables, fallback }) {
  * @throws LangChainExecutionError if the chain execution fails or returns empty results
  */
 const executeChain = async ({ llm, prompt, variables, parser }) => {
-    // Validate all required parameters
     validateRequired(llm, 'llm', 'executeChain');
     validateRequired(prompt, 'prompt', 'executeChain');
     validateRequired(variables, 'variables', 'executeChain');
@@ -6058,7 +6137,6 @@ const executeChain = async ({ llm, prompt, variables, parser }) => {
     try {
         const chain = prompt.pipe(llm).pipe(parser);
         const result = await chain.invoke(variables);
-        console.debug('LLMChain call result:', result);
         if (result === null || result === undefined) {
             throw new LangChainExecutionError('executeChain: Chain execution returned null or undefined result', { variables, promptInputVariables: prompt.inputVariables });
         }
@@ -7406,7 +7484,6 @@ class OutputFixingParser extends BaseOutputParser {
  * @throws LangChainExecutionError if parser creation fails
  */
 function createSchemaParser(schema, llm, options = {}) {
-    // Validate required parameters
     validateRequired(schema, 'schema', 'createSchemaParser');
     validateRequired(llm, 'llm', 'createSchemaParser');
     validateRequired(options, 'options', 'createSchemaParser');
@@ -7466,7 +7543,6 @@ You must return ONLY valid JSON that matches the schema exactly. Do not include
 async function executeChainWithSchema(schema, llm, prompt, variables, options = {}) {
     const { retryOptions = { maxAttempts: 3 }, fallbackParser, onFallback, ...parserOptions } = options;
     const parser = createSchemaParser(schema, llm, parserOptions);
-    // Define the operation to retry
     const operation = async () => {
         const result = await executeChain({
             llm,
@@ -7477,16 +7553,13 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
         return result;
     };
     try {
-        // Use the general retry utility
         return await withRetry(operation, retryOptions);
     }
     catch (error) {
-        // If all retries failed and we have a fallback parser, use it
         if (fallbackParser) {
             if (onFallback) {
                 onFallback();
             }
-            // Generate without structured parsing as fallback
             const fallbackResult = await executeChain({
                 llm,
                 prompt,
@@ -10870,6 +10943,11 @@ const handler$3 = async (argv, logger) => {
     else {
         logger.setConfig({ silent: true });
     }
+    if (config.service.provider === 'ollama') {
+        logger.verbose('⚠️  Ollama models may not strictly adhere to the output format instructions.', {
+            color: 'yellow',
+        });
+    }
     async function factory() {
         const changes = await getChanges({
             git,
@@ -10925,11 +11003,6 @@ const handler$3 = async (argv, logger) => {
                 variables: promptTemplate.inputVariables,
                 fallback: promptTemplate,
             });
-            if (config.service.provider === 'ollama') {
-                logger.log('Note: Ollama models may not strictly adhere to the output format instructions.', {
-                    color: 'yellow',
-                });
-            }
             // Get additional context if provided
             let additional_context = '';
             if (argv.additional) {
@@ -10970,7 +11043,7 @@ const handler$3 = async (argv, logger) => {
                     maxAttempts,
                     onRetry: (attempt, error) => {
                         logger.verbose(`Failed to parse commit message (attempt ${attempt}/${maxAttempts}): ${error.message}`, { color: 'yellow' });
-                    }
+                    },
                 },
                 fallbackParser: (text) => ({
                     title: text.split('\n')[0] || 'Auto-generated commit',
@@ -11191,11 +11264,22 @@ async function getProjectConfigFilePath(configFileName) {
 }
 
 const OPEN_AI_MODELS = [
+    'gpt-4.5',
     'gpt-4o',
+    'gpt-4o-mini',
+    'gpt-4.1',
+    'gpt-4.1',
+    'gpt-4.1-mini',
+    'gpt-4.1-nano',
     'gpt-4-32k',
     'gpt-4-turbo',
     'gpt-4',
     'gpt-3.5-turbo',
+    'o1',
+    'o1-mini',
+    '03-mini',
+    '03',
+    'o4-mini',
 ];
 const ANTHROPIC_MODELS = [
     'claude-sonnet-4-0',
@@ -11340,6 +11424,32 @@ const questions = {
         });
         return parseFloat(temperature);
     },
+    inputOllamaEndpoint: async () => {
+        return await input({
+            message: 'Ollama endpoint (e.g., http://localhost:11434):',
+            default: 'http://localhost:11434',
+        });
+    },
+    inputRequestTimeout: async () => {
+        const timeout = await input({
+            message: 'Request timeout in milliseconds:',
+            default: '30000',
+        });
+        return parseInt(timeout);
+    },
+    inputRequestMaxRetries: async () => {
+        const maxRetries = await input({
+            message: 'Maximum number of request retries:',
+            default: '3',
+        });
+        return parseInt(maxRetries);
+    },
+    inputServiceFields: async () => {
+        return await editor({
+            message: 'Enter additional service fields as a JSON string (optional):',
+            default: '{}',
+        });
+    },
     selectDefaultGitBranch: async () => (await input({
         message: 'default branch for the repository:',
         default: 'main',
@@ -11433,6 +11543,29 @@ const handler$2 = async (argv, logger) => {
                 tokenLimit: await questions.inputTokenLimit(),
             };
             config.verbose = await questions.enableVerboseMode();
+            if (llmProvider === 'ollama') {
+                config.service.endpoint = await questions.inputOllamaEndpoint();
+            }
+            config.service.requestOptions = {
+                timeout: await questions.inputRequestTimeout(),
+                maxRetries: await questions.inputRequestMaxRetries(),
+            };
+            const promptForServiceFields = await confirm({
+                message: 'would you like to configure additional service fields (advanced)?',
+                default: false,
+            });
+            if (promptForServiceFields) {
+                const fieldsJson = await questions.inputServiceFields();
+                try {
+                    config.service.fields = JSON.parse(fieldsJson);
+                }
+                catch (e) {
+                    logger.log('Invalid JSON for service fields. Skipping.', { color: 'red' });
+                    logger.verbose(`Error parsing service fields: ${e.message}`, {
+                        color: 'red',
+                    });
+                }
+            }
             const promptForIgnores = await confirm({
                 message: 'would you like to configure ignored files and extensions?',
                 default: false,

package/dist/index.js

@@ -68,7 +68,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline$1);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.17.0";
+const BUILD_VERSION = "0.18.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -367,7 +367,7 @@ function getDefaultServiceApiKey(config) {
 }
 const DEFAULT_OPENAI_LLM_SERVICE = {
     provider: 'openai',
-    model: 'gpt-4o',
+    model: 'gpt-4o-mini',
     tokenLimit: 2024,
     temperature: 0.32,
     authentication: {
@@ -476,14 +476,29 @@ const CONFIG_KEYS = Object.keys({
  **/
 function loadEnvConfig(config) {
     const envConfig = {};
-    const envKeys = [...CONFIG_KEYS, 'COCO_SERVICE_PROVIDER', 'COCO_SERVICE_MODEL', 'OPEN_AI_KEY'];
+    const envKeys = [
+        ...CONFIG_KEYS,
+        'COCO_SERVICE_PROVIDER',
+        'COCO_SERVICE_MODEL',
+        'OPEN_AI_KEY',
+        'COCO_SERVICE_ENDPOINT',
+        'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT',
+        'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES',
+        'COCO_SERVICE_FIELDS',
+    ];
     envKeys.forEach((key) => {
         const envVarName = toEnvVarName(key);
         const envValue = parseEnvValue(key, process.env[envVarName]);
         if (envValue === undefined) {
             return;
         }
-        if (key === 'COCO_SERVICE_PROVIDER' || key === 'COCO_SERVICE_MODEL' || key === 'OPEN_AI_KEY') {
+        if (key === 'COCO_SERVICE_PROVIDER' ||
+            key === 'COCO_SERVICE_MODEL' ||
+            key === 'OPEN_AI_KEY' ||
+            key === 'COCO_SERVICE_ENDPOINT' ||
+            key === 'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT' ||
+            key === 'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES' ||
+            key === 'COCO_SERVICE_FIELDS') {
             // NOTE: We want to ensure that the service object is always defined
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -510,9 +525,28 @@ function handleServiceEnvVar(service, key, value) {
             break;
         case 'OPEN_AI_KEY':
             if (service.provider === 'openai') {
-                service.fields = { apiKey: value };
+                service.authentication = {
+                    type: 'APIKey',
+                    credentials: {
+                        apiKey: value,
+                    },
+                };
             }
             break;
+        case 'COCO_SERVICE_ENDPOINT':
+            if (service.provider === 'ollama') {
+                service.endpoint = value;
+            }
+            break;
+        case 'COCO_SERVICE_REQUEST_OPTIONS_TIMEOUT':
+            service.requestOptions = { ...service.requestOptions, timeout: value };
+            break;
+        case 'COCO_SERVICE_REQUEST_OPTIONS_MAX_RETRIES':
+            service.requestOptions = { ...service.requestOptions, maxRetries: value };
+            break;
+        case 'COCO_SERVICE_FIELDS':
+            service.fields = value;
+            break;
     }
 }
 function parseEnvValue(key, value) {
@@ -531,6 +565,9 @@ function parseEnvValue(key, value) {
         // Handle number values
         case typeof value === 'string' && !isNaN(Number(value)):
             return Number(value);
+        // Handle JSON strings
+        case typeof value === 'string' && value.startsWith('{'):
+            return JSON.parse(value);
         default:
             return value;
     }
@@ -544,32 +581,40 @@ function toEnvVarName(key) {
     }
     return `COCO_${key.replace(/([A-Z])/g, '_$1').toLocaleUpperCase()}`;
 }
-function formatEnvValue(value) {
-    if (typeof value === 'number') {
-        return `${value}`;
-    }
-    else if (Array.isArray(value)) {
-        return `${value.join(',')}`;
-    }
-    else if (typeof value === 'string') {
-        // Escape newlines and tabs in strings
-        return `${value.replace(/\n/g, '\\n').replace(/\t/g, '\\t')}`;
+const flattenObject = (obj, prefix = '') => {
+    let flattened = {};
+    for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            const propName = prefix ? `${prefix}_${key}` : key;
+            const value = obj[key];
+            // Skip undefined or null values
+            if (value === undefined || value === null) {
+                continue;
+            }
+            if (typeof value === 'object' && !Array.isArray(value)) {
+                // Handle nested objects, but specifically handle 'fields' as JSON string
+                if (key === 'fields') {
+                    flattened[propName.toUpperCase()] = JSON.stringify(value);
+                }
+                else {
+                    flattened = { ...flattened, ...flattenObject(value, propName) };
+                }
+            }
+            else {
+                // For primitive types (string, number, boolean, symbol, bigint) and arrays
+                flattened[propName.toUpperCase()] = String(value);
+            }
+        }
     }
-    return `${value}`;
-}
+    return flattened;
+};
 const appendToEnvFile = async (filePath, config) => {
     const getNewContent = async () => {
-        return Object.entries(config)
+        const flattenedConfig = flattenObject(config);
+        return Object.entries(flattenedConfig)
             .map(([key, value]) => {
-            if (key === 'service') {
-                const service = value;
-                return `${service.provider ? `COCO_SERVICE_PROVIDER=${service.provider}` : ''}\n${service.model ? `COCO_SERVICE_MODEL=${service.model}` : ''}\n${service.authentication.type === 'APIKey'
-                    ? `OPEN_AI_KEY=${service.authentication.credentials.apiKey}`
-                    : ''}`;
-            }
             const envVarName = toEnvVarName(key);
-            const envValue = formatEnvValue(value);
-            return `${envVarName}=${envValue}`;
+            return `${envVarName}=${value}`;
         })
             .join('\n');
     };
@@ -593,22 +638,31 @@ function loadGitConfig(config) {
     if (fs__namespace.existsSync(gitConfigPath)) {
         const gitConfigRaw = fs__namespace.readFileSync(gitConfigPath, 'utf-8');
         const gitConfigParsed = ini__namespace.parse(gitConfigRaw);
-        const gitConfigServiceObject = gitConfigParsed.coco?.service;
         let service = config.service;
-        if (gitConfigServiceObject) {
-            const gitServiceConfig = JSON.parse(gitConfigServiceObject);
-            service = gitServiceConfig || config?.service;
+        if (gitConfigParsed.coco) {
+            service = {
+                provider: gitConfigParsed.coco?.serviceProvider,
+                model: gitConfigParsed.coco?.serviceModel,
+                authentication: {
+                    type: 'APIKey',
+                    credentials: {
+                        apiKey: gitConfigParsed.coco?.serviceApiKey,
+                    },
+                },
+                requestOptions: {
+                    timeout: Number(gitConfigParsed.coco?.serviceRequestOptionsTimeout),
+                    maxRetries: Number(gitConfigParsed.coco?.serviceRequestOptionsMaxRetries),
+                },
+                endpoint: gitConfigParsed.coco?.serviceEndpoint,
+                fields: gitConfigParsed.coco?.serviceFields
+                    ? JSON.parse(gitConfigParsed.coco?.serviceFields)
+                    : undefined,
+            };
         }
         config = {
             ...config,
+            ...gitConfigParsed.coco,
             service: service,
-            prompt: gitConfigParsed.coco?.prompt || config.prompt,
-            mode: gitConfigParsed.coco?.mode || config.mode,
-            summarizePrompt: gitConfigParsed.coco?.summarizePrompt || config.summarizePrompt,
-            ignoredFiles: gitConfigParsed.coco?.ignoredFiles || config.ignoredFiles,
-            ignoredExtensions: gitConfigParsed.coco?.ignoredExtensions || config.ignoredExtensions,
-            defaultBranch: gitConfigParsed.coco?.defaultBranch || config.defaultBranch,
-            verbose: gitConfigParsed.coco?.verbose || config.verbose,
         };
     }
     return removeUndefined(config);
@@ -628,9 +682,28 @@ const appendToGitConfig = async (filePath, config) => {
         const contentLines = [header];
         for (const key in config) {
             const value = config[key];
-            if (typeof value === 'object') {
-                // Serialize object to JSON string
-                contentLines.push(`\t${key} = ${JSON.stringify(value)}`);
+            if (key === 'service') {
+                const service = value;
+                contentLines.push(`	serviceProvider = ${service.provider}`);
+                contentLines.push(`	serviceModel = ${service.model}`);
+                if (service.authentication.type === 'APIKey') {
+                    contentLines.push(`	serviceApiKey = ${service.authentication.credentials.apiKey}`);
+                }
+                if (service.requestOptions?.timeout) {
+                    contentLines.push(`	serviceRequestOptionsTimeout = ${service.requestOptions.timeout}`);
+                }
+                if (service.requestOptions?.maxRetries) {
+                    contentLines.push(`	serviceRequestOptionsMaxRetries = ${service.requestOptions.maxRetries}`);
+                }
+                if (service.provider === 'ollama') {
+                    const ollamaService = service;
+                    if (ollamaService.endpoint) {
+                        contentLines.push(`	serviceEndpoint = ${ollamaService.endpoint}`);
+                    }
+                }
+                if (service.fields) {
+                    contentLines.push(`	serviceFields = ${JSON.stringify(service.fields)}`);
+                }
             }
             else if (typeof value === 'string' && value.includes('\n')) {
                 // Wrap strings with new lines in quotes
@@ -1084,65 +1157,7 @@ const schema$1 = {
         "LLMModel": {
             "anyOf": [
                 {
-                    "type": "string",
-                    "enum": [
-                        "davinci-002",
-                        "babbage-002",
-                        "text-davinci-003",
-                        "text-davinci-002",
-                        "text-davinci-001",
-                        "text-curie-001",
-                        "text-babbage-001",
-                        "text-ada-001",
-                        "davinci",
-                        "curie",
-                        "babbage",
-                        "ada",
-                        "code-davinci-002",
-                        "code-davinci-001",
-                        "code-cushman-002",
-                        "code-cushman-001",
-                        "davinci-codex",
-                        "cushman-codex",
-                        "text-davinci-edit-001",
-                        "code-davinci-edit-001",
-                        "text-embedding-ada-002",
-                        "text-similarity-davinci-001",
-                        "text-similarity-curie-001",
-                        "text-similarity-babbage-001",
-                        "text-similarity-ada-001",
-                        "text-search-davinci-doc-001",
-                        "text-search-curie-doc-001",
-                        "text-search-babbage-doc-001",
-                        "text-search-ada-doc-001",
-                        "code-search-babbage-code-001",
-                        "code-search-ada-code-001",
-                        "gpt2",
-                        "gpt-3.5-turbo",
-                        "gpt-35-turbo",
-                        "gpt-3.5-turbo-0301",
-                        "gpt-3.5-turbo-0613",
-                        "gpt-3.5-turbo-1106",
-                        "gpt-3.5-turbo-0125",
-                        "gpt-3.5-turbo-16k",
-                        "gpt-3.5-turbo-16k-0613",
-                        "gpt-3.5-turbo-instruct",
-                        "gpt-3.5-turbo-instruct-0914",
-                        "gpt-4",
-                        "gpt-4-0314",
-                        "gpt-4-0613",
-                        "gpt-4-32k",
-                        "gpt-4-32k-0314",
-                        "gpt-4-32k-0613",
-                        "gpt-4-turbo",
-                        "gpt-4-turbo-2024-04-09",
-                        "gpt-4-turbo-preview",
-                        "gpt-4-1106-preview",
-                        "gpt-4-0125-preview",
-                        "gpt-4-vision-preview",
-                        "gpt-4o",
-                        "gpt-4o-2024-05-13"
-                    ]
+                    "$ref": "#/definitions/OpenAIModel"
                 },
                 {
                     "$ref": "#/definitions/OllamaModel"
@@ -1152,6 +1167,71 @@ const schema$1 = {
                 }
             ]
         },
+        "OpenAIModel": {
+            "type": "string",
+            "enum": [
+                "davinci-002",
+                "babbage-002",
+                "text-davinci-003",
+                "text-davinci-002",
+                "text-davinci-001",
+                "text-curie-001",
+                "text-babbage-001",
+                "text-ada-001",
+                "davinci",
+                "curie",
+                "babbage",
+                "ada",
+                "code-davinci-002",
+                "code-davinci-001",
+                "code-cushman-002",
+                "code-cushman-001",
+                "davinci-codex",
+                "cushman-codex",
+                "text-davinci-edit-001",
+                "code-davinci-edit-001",
+                "text-embedding-ada-002",
+                "text-similarity-davinci-001",
+                "text-similarity-curie-001",
+                "text-similarity-babbage-001",
+                "text-similarity-ada-001",
+                "text-search-davinci-doc-001",
+                "text-search-curie-doc-001",
+                "text-search-babbage-doc-001",
+                "text-search-ada-doc-001",
+                "code-search-babbage-code-001",
+                "code-search-ada-code-001",
+                "gpt2",
+                "gpt-3.5-turbo",
+                "gpt-35-turbo",
+                "gpt-3.5-turbo-0301",
+                "gpt-3.5-turbo-0613",
+                "gpt-3.5-turbo-1106",
+                "gpt-3.5-turbo-0125",
+                "gpt-3.5-turbo-16k",
+                "gpt-3.5-turbo-16k-0613",
+                "gpt-3.5-turbo-instruct",
+                "gpt-3.5-turbo-instruct-0914",
+                "gpt-4",
+                "gpt-4-0314",
+                "gpt-4-0613",
+                "gpt-4-32k",
+                "gpt-4-32k-0314",
+                "gpt-4-32k-0613",
+                "gpt-4-turbo",
+                "gpt-4-turbo-2024-04-09",
+                "gpt-4-turbo-preview",
+                "gpt-4-1106-preview",
+                "gpt-4-0125-preview",
+                "gpt-4-vision-preview",
+                "gpt-4o",
+                "gpt-4o-2024-05-13",
+                "gpt-4o-mini",
+                "gpt-4.1",
+                "gpt-4.1-mini",
+                "gpt-4.1-nano"
+            ]
+        },
         "OllamaModel": {
             "type": "string",
             "enum": [
@@ -6068,7 +6148,6 @@ function getPrompt({ template, variables, fallback }) {
  * @throws LangChainExecutionError if the chain execution fails or returns empty results
  */
 const executeChain = async ({ llm, prompt, variables, parser }) => {
-    // Validate all required parameters
     validateRequired(llm, 'llm', 'executeChain');
     validateRequired(prompt, 'prompt', 'executeChain');
     validateRequired(variables, 'variables', 'executeChain');
@@ -6080,7 +6159,6 @@ const executeChain = async ({ llm, prompt, variables, parser }) => {
     try {
         const chain = prompt.pipe(llm).pipe(parser);
         const result = await chain.invoke(variables);
-        console.debug('LLMChain call result:', result);
         if (result === null || result === undefined) {
             throw new LangChainExecutionError('executeChain: Chain execution returned null or undefined result', { variables, promptInputVariables: prompt.inputVariables });
         }
@@ -7428,7 +7506,6 @@ class OutputFixingParser extends output_parsers.BaseOutputParser {
  * @throws LangChainExecutionError if parser creation fails
  */
 function createSchemaParser(schema, llm, options = {}) {
-    // Validate required parameters
     validateRequired(schema, 'schema', 'createSchemaParser');
     validateRequired(llm, 'llm', 'createSchemaParser');
     validateRequired(options, 'options', 'createSchemaParser');
@@ -7488,7 +7565,6 @@ You must return ONLY valid JSON that matches the schema exactly. Do not include
 async function executeChainWithSchema(schema, llm, prompt, variables, options = {}) {
     const { retryOptions = { maxAttempts: 3 }, fallbackParser, onFallback, ...parserOptions } = options;
     const parser = createSchemaParser(schema, llm, parserOptions);
-    // Define the operation to retry
     const operation = async () => {
         const result = await executeChain({
             llm,
@@ -7499,16 +7575,13 @@ async function executeChainWithSchema(schema, llm, prompt, variables, options =
         return result;
     };
     try {
-        // Use the general retry utility
         return await withRetry(operation, retryOptions);
     }
     catch (error) {
-        // If all retries failed and we have a fallback parser, use it
         if (fallbackParser) {
             if (onFallback) {
                 onFallback();
             }
-            // Generate without structured parsing as fallback
             const fallbackResult = await executeChain({
                 llm,
                 prompt,
@@ -10892,6 +10965,11 @@ const handler$3 = async (argv, logger) => {
     else {
         logger.setConfig({ silent: true });
     }
+    if (config.service.provider === 'ollama') {
+        logger.verbose('⚠️  Ollama models may not strictly adhere to the output format instructions.', {
+            color: 'yellow',
+        });
+    }
     async function factory() {
         const changes = await getChanges({
             git,
@@ -10947,11 +11025,6 @@ const handler$3 = async (argv, logger) => {
                 variables: promptTemplate.inputVariables,
                 fallback: promptTemplate,
             });
-            if (config.service.provider === 'ollama') {
-                logger.log('Note: Ollama models may not strictly adhere to the output format instructions.', {
-                    color: 'yellow',
-                });
-            }
             // Get additional context if provided
             let additional_context = '';
             if (argv.additional) {
@@ -10992,7 +11065,7 @@ const handler$3 = async (argv, logger) => {
                     maxAttempts,
                     onRetry: (attempt, error) => {
                         logger.verbose(`Failed to parse commit message (attempt ${attempt}/${maxAttempts}): ${error.message}`, { color: 'yellow' });
-                    }
+                    },
                 },
                 fallbackParser: (text) => ({
                     title: text.split('\n')[0] || 'Auto-generated commit',
@@ -11213,11 +11286,22 @@ async function getProjectConfigFilePath(configFileName) {
 }
 
 const OPEN_AI_MODELS = [
+    'gpt-4.5',
     'gpt-4o',
+    'gpt-4o-mini',
+    'gpt-4.1',
+    'gpt-4.1',
+    'gpt-4.1-mini',
+    'gpt-4.1-nano',
     'gpt-4-32k',
     'gpt-4-turbo',
     'gpt-4',
     'gpt-3.5-turbo',
+    'o1',
+    'o1-mini',
+    '03-mini',
+    '03',
+    'o4-mini',
 ];
 const ANTHROPIC_MODELS = [
     'claude-sonnet-4-0',
@@ -11362,6 +11446,32 @@ const questions = {
         });
         return parseFloat(temperature);
     },
+    inputOllamaEndpoint: async () => {
+        return await prompts.input({
+            message: 'Ollama endpoint (e.g., http://localhost:11434):',
+            default: 'http://localhost:11434',
+        });
+    },
+    inputRequestTimeout: async () => {
+        const timeout = await prompts.input({
+            message: 'Request timeout in milliseconds:',
+            default: '30000',
+        });
+        return parseInt(timeout);
+    },
+    inputRequestMaxRetries: async () => {
+        const maxRetries = await prompts.input({
+            message: 'Maximum number of request retries:',
+            default: '3',
+        });
+        return parseInt(maxRetries);
+    },
+    inputServiceFields: async () => {
+        return await prompts.editor({
+            message: 'Enter additional service fields as a JSON string (optional):',
+            default: '{}',
+        });
+    },
     selectDefaultGitBranch: async () => (await prompts.input({
         message: 'default branch for the repository:',
         default: 'main',
@@ -11455,6 +11565,29 @@ const handler$2 = async (argv, logger) => {
                 tokenLimit: await questions.inputTokenLimit(),
             };
             config.verbose = await questions.enableVerboseMode();
+            if (llmProvider === 'ollama') {
+                config.service.endpoint = await questions.inputOllamaEndpoint();
+            }
+            config.service.requestOptions = {
+                timeout: await questions.inputRequestTimeout(),
+                maxRetries: await questions.inputRequestMaxRetries(),
+            };
+            const promptForServiceFields = await prompts.confirm({
+                message: 'would you like to configure additional service fields (advanced)?',
+                default: false,
+            });
+            if (promptForServiceFields) {
+                const fieldsJson = await questions.inputServiceFields();
+                try {
+                    config.service.fields = JSON.parse(fieldsJson);
+                }
+                catch (e) {
+                    logger.log('Invalid JSON for service fields. Skipping.', { color: 'red' });
+                    logger.verbose(`Error parsing service fields: ${e.message}`, {
+                        color: 'red',
+                    });
+                }
+            }
             const promptForIgnores = await prompts.confirm({
                 message: 'would you like to configure ignored files and extensions?',
                 default: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",
@@ -105,7 +105,7 @@
     "performance-now": "2.1.0",
     "pretty-ms": "7.0.1",
     "simple-git": "3.27.0",
-    "tiktoken": "^1.0.17",
+    "tiktoken": "^1.0.21",
     "yargs": "17.7.2"
   },
   "resolutions": {