opencommit 3.2.11 → 3.2.12

package/README.md

@@ -201,6 +201,28 @@ or for as a cheaper option:
 oco config set OCO_MODEL=gpt-3.5-turbo
 ```
 
+### Model Management
+
+OpenCommit automatically fetches available models from your provider when you run `oco setup`. Models are cached for 7 days to reduce API calls.
+
+To see available models for your current provider:
+
+```sh
+oco models
+```
+
+To refresh the model list (e.g., after new models are released):
+
+```sh
+oco models --refresh
+```
+
+To see models for a specific provider:
+
+```sh
+oco models --provider anthropic
+```
+
 ### Switch to other LLM providers with a custom URL
 
 By default OpenCommit uses [OpenAI](https://openai.com).

package/out/cli.cjs

@@ -48509,7 +48509,7 @@ function G3(t2, e3) {
 // package.json
 var package_default = {
   name: "opencommit",
-  version: "3.2.11",
+  version: "3.2.12",
   description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}",
   keywords: [
     "git",
@@ -53911,9 +53911,6 @@ var { AnthropicError: AnthropicError2, APIError: APIError2, APIConnectionError:
 })(Anthropic || (Anthropic = {}));
 var sdk_default = Anthropic;
 
-// src/engine/anthropic.ts
-init_dist2();
-
 // node_modules/axios/lib/helpers/bind.js
 function bind(fn, thisArg) {
   return function wrap() {
@@ -57224,6 +57221,51 @@ var {
 } = axios_default;
 
 // src/utils/errors.ts
+var PROVIDER_BILLING_URLS = {
+  ["anthropic" /* ANTHROPIC */]: "https://console.anthropic.com/settings/billing",
+  ["openai" /* OPENAI */]: "https://platform.openai.com/settings/organization/billing",
+  ["gemini" /* GEMINI */]: "https://aistudio.google.com/app/plan",
+  ["groq" /* GROQ */]: "https://console.groq.com/settings/billing",
+  ["mistral" /* MISTRAL */]: "https://console.mistral.ai/billing/",
+  ["deepseek" /* DEEPSEEK */]: "https://platform.deepseek.com/usage",
+  ["openrouter" /* OPENROUTER */]: "https://openrouter.ai/credits",
+  ["aimlapi" /* AIMLAPI */]: "https://aimlapi.com/app/billing",
+  ["azure" /* AZURE */]: "https://portal.azure.com/#view/Microsoft_Azure_CostManagement",
+  ["ollama" /* OLLAMA */]: null,
+  ["mlx" /* MLX */]: null,
+  ["flowise" /* FLOWISE */]: null,
+  ["test" /* TEST */]: null
+};
+var InsufficientCreditsError = class extends Error {
+  constructor(provider, message) {
+    super(message || `Insufficient credits or quota for provider '${provider}'`);
+    this.name = "InsufficientCreditsError";
+    this.provider = provider;
+  }
+};
+var RateLimitError3 = class extends Error {
+  constructor(provider, retryAfter, message) {
+    super(message || `Rate limit exceeded for provider '${provider}'`);
+    this.name = "RateLimitError";
+    this.provider = provider;
+    this.retryAfter = retryAfter;
+  }
+};
+var ServiceUnavailableError = class extends Error {
+  constructor(provider, statusCode = 503, message) {
+    super(message || `Service unavailable for provider '${provider}'`);
+    this.name = "ServiceUnavailableError";
+    this.provider = provider;
+    this.statusCode = statusCode;
+  }
+};
+var AuthenticationError3 = class extends Error {
+  constructor(provider, message) {
+    super(message || `Authentication failed for provider '${provider}'`);
+    this.name = "AuthenticationError";
+    this.provider = provider;
+  }
+};
 var ModelNotFoundError = class extends Error {
   constructor(modelName, provider, statusCode = 404) {
     super(`Model '${modelName}' not found for provider '${provider}'`);
@@ -57233,6 +57275,13 @@ var ModelNotFoundError = class extends Error {
     this.statusCode = statusCode;
   }
 };
+var ApiKeyMissingError = class extends Error {
+  constructor(provider) {
+    super(`API key is missing for provider '${provider}'`);
+    this.name = "ApiKeyMissingError";
+    this.provider = provider;
+  }
+};
 function isModelNotFoundError(error) {
   if (error instanceof ModelNotFoundError) {
     return true;
@@ -57257,6 +57306,24 @@ function isModelNotFoundError(error) {
   }
   return false;
 }
+function isApiKeyError(error) {
+  if (error instanceof ApiKeyMissingError) {
+    return true;
+  }
+  if (error instanceof Error) {
+    const message = error.message.toLowerCase();
+    if (message.includes("api key") || message.includes("apikey") || message.includes("authentication") || message.includes("unauthorized") || message.includes("invalid_api_key") || message.includes("incorrect api key")) {
+      return true;
+    }
+    if ("response" in error) {
+      const response = error.response;
+      if (response?.status === 401) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 function getSuggestedModels(provider, failedModel) {
   const providerKey = provider.toLowerCase();
   const models = MODEL_LIST[providerKey];
@@ -57265,6 +57332,276 @@ function getSuggestedModels(provider, failedModel) {
   }
   return models.filter((m5) => m5 !== failedModel).slice(0, 5);
 }
+function isInsufficientCreditsError(error) {
+  if (error instanceof InsufficientCreditsError) {
+    return true;
+  }
+  if (error instanceof Error) {
+    const message = error.message.toLowerCase();
+    if (message.includes("insufficient") || message.includes("credit") || message.includes("quota") || message.includes("balance") || message.includes("billing") || message.includes("payment") || message.includes("exceeded") || message.includes("limit reached") || message.includes("no remaining")) {
+      return true;
+    }
+    if ("status" in error && error.status === 402) {
+      return true;
+    }
+    if ("response" in error) {
+      const response = error.response;
+      if (response?.status === 402) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function isRateLimitError(error) {
+  if (error instanceof RateLimitError3) {
+    return true;
+  }
+  if (error instanceof Error) {
+    const message = error.message.toLowerCase();
+    if (message.includes("rate limit") || message.includes("rate_limit") || message.includes("too many requests") || message.includes("throttle")) {
+      return true;
+    }
+    if ("status" in error && error.status === 429) {
+      return true;
+    }
+    if ("response" in error) {
+      const response = error.response;
+      if (response?.status === 429) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function isServiceUnavailableError(error) {
+  if (error instanceof ServiceUnavailableError) {
+    return true;
+  }
+  if (error instanceof Error) {
+    const message = error.message.toLowerCase();
+    if (message.includes("service unavailable") || message.includes("server error") || message.includes("internal error") || message.includes("temporarily unavailable") || message.includes("overloaded")) {
+      return true;
+    }
+    const status = error.status || error.response?.status;
+    if (status && status >= 500 && status < 600) {
+      return true;
+    }
+  }
+  return false;
+}
+function formatUserFriendlyError(error, provider) {
+  const billingUrl = PROVIDER_BILLING_URLS[provider] || null;
+  if (error instanceof InsufficientCreditsError) {
+    return {
+      title: "Insufficient Credits",
+      message: `Your ${provider} account has insufficient credits or quota.`,
+      helpUrl: billingUrl,
+      suggestion: "Add credits to your account to continue using the service."
+    };
+  }
+  if (error instanceof RateLimitError3) {
+    const retryMsg = error.retryAfter ? `Please wait ${error.retryAfter} seconds before retrying.` : "Please wait a moment before retrying.";
+    return {
+      title: "Rate Limit Exceeded",
+      message: `You've made too many requests to ${provider}.`,
+      helpUrl: billingUrl,
+      suggestion: retryMsg
+    };
+  }
+  if (error instanceof ServiceUnavailableError) {
+    return {
+      title: "Service Unavailable",
+      message: `The ${provider} service is temporarily unavailable.`,
+      helpUrl: null,
+      suggestion: "Please try again in a few moments."
+    };
+  }
+  if (error instanceof AuthenticationError3) {
+    return {
+      title: "Authentication Failed",
+      message: `Your ${provider} API key is invalid or expired.`,
+      helpUrl: billingUrl,
+      suggestion: "Run `oco setup` to configure a valid API key."
+    };
+  }
+  if (error instanceof ModelNotFoundError) {
+    return {
+      title: "Model Not Found",
+      message: `The model '${error.modelName}' is not available for ${provider}.`,
+      helpUrl: null,
+      suggestion: "Run `oco setup` to select a valid model."
+    };
+  }
+  if (isInsufficientCreditsError(error)) {
+    return {
+      title: "Insufficient Credits",
+      message: `Your ${provider} account has insufficient credits or quota.`,
+      helpUrl: billingUrl,
+      suggestion: "Add credits to your account to continue using the service."
+    };
+  }
+  if (isRateLimitError(error)) {
+    return {
+      title: "Rate Limit Exceeded",
+      message: `You've made too many requests to ${provider}.`,
+      helpUrl: billingUrl,
+      suggestion: "Please wait a moment before retrying."
+    };
+  }
+  if (isServiceUnavailableError(error)) {
+    return {
+      title: "Service Unavailable",
+      message: `The ${provider} service is temporarily unavailable.`,
+      helpUrl: null,
+      suggestion: "Please try again in a few moments."
+    };
+  }
+  if (isApiKeyError(error)) {
+    return {
+      title: "Authentication Failed",
+      message: `Your ${provider} API key is invalid or expired.`,
+      helpUrl: billingUrl,
+      suggestion: "Run `oco setup` to configure a valid API key."
+    };
+  }
+  if (isModelNotFoundError(error)) {
+    const model = error.modelName || error.model || "unknown";
+    return {
+      title: "Model Not Found",
+      message: `The model '${model}' is not available for ${provider}.`,
+      helpUrl: null,
+      suggestion: "Run `oco setup` to select a valid model."
+    };
+  }
+  const errorMessage = error instanceof Error ? error.message : String(error);
+  return {
+    title: "Error",
+    message: errorMessage,
+    helpUrl: null,
+    suggestion: "Run `oco setup` to reconfigure or check your settings."
+  };
+}
+function printFormattedError(formatted) {
+  let output = `
+${source_default.red("\u2716")} ${source_default.bold.red(formatted.title)}
+`;
+  output += `  ${formatted.message}
+`;
+  if (formatted.helpUrl) {
+    output += `
+  ${source_default.cyan("Help:")} ${source_default.underline(formatted.helpUrl)}
+`;
+  }
+  if (formatted.suggestion) {
+    output += `
+  ${source_default.yellow("Suggestion:")} ${formatted.suggestion}
+`;
+  }
+  return output;
+}
+
+// src/utils/engineErrorHandler.ts
+function getStatusCode(error) {
+  if (typeof error?.status === "number") {
+    return error.status;
+  }
+  if (axios_default.isAxiosError(error)) {
+    return error.response?.status ?? null;
+  }
+  if (typeof error?.response?.status === "number") {
+    return error.response.status;
+  }
+  return null;
+}
+function getRetryAfter(error) {
+  const headers = error?.response?.headers;
+  if (headers) {
+    const retryAfter = headers["retry-after"] || headers["Retry-After"];
+    if (retryAfter) {
+      const seconds = parseInt(retryAfter, 10);
+      if (!isNaN(seconds)) {
+        return seconds;
+      }
+    }
+  }
+  return void 0;
+}
+function extractErrorMessage(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  const apiError = error?.response?.data?.error;
+  if (apiError) {
+    if (typeof apiError === "string") {
+      return apiError;
+    }
+    if (apiError.message) {
+      return apiError.message;
+    }
+  }
+  const errorData = error?.error;
+  if (errorData) {
+    if (typeof errorData === "string") {
+      return errorData;
+    }
+    if (errorData.message) {
+      return errorData.message;
+    }
+  }
+  if (typeof error === "string") {
+    return error;
+  }
+  return "An unknown error occurred";
+}
+function isModelNotFoundMessage(message) {
+  const lowerMessage = message.toLowerCase();
+  return lowerMessage.includes("model") && (lowerMessage.includes("not found") || lowerMessage.includes("does not exist") || lowerMessage.includes("invalid") || lowerMessage.includes("pull")) || lowerMessage.includes("does_not_exist");
+}
+function isInsufficientCreditsMessage(message) {
+  const lowerMessage = message.toLowerCase();
+  return lowerMessage.includes("insufficient") || lowerMessage.includes("credit") || lowerMessage.includes("quota") || lowerMessage.includes("balance too low") || lowerMessage.includes("billing") || lowerMessage.includes("payment required") || lowerMessage.includes("exceeded");
+}
+function normalizeEngineError(error, provider, model) {
+  if (error instanceof ModelNotFoundError || error instanceof AuthenticationError3 || error instanceof InsufficientCreditsError || error instanceof RateLimitError3 || error instanceof ServiceUnavailableError) {
+    return error;
+  }
+  const statusCode = getStatusCode(error);
+  const message = extractErrorMessage(error);
+  switch (statusCode) {
+    case 401:
+      return new AuthenticationError3(provider, message);
+    case 402:
+      return new InsufficientCreditsError(provider, message);
+    case 404:
+      if (isModelNotFoundMessage(message)) {
+        return new ModelNotFoundError(model, provider, 404);
+      }
+      return error instanceof Error ? error : new Error(message);
+    case 429:
+      const retryAfter = getRetryAfter(error);
+      return new RateLimitError3(provider, retryAfter, message);
+    case 500:
+    case 502:
+    case 503:
+    case 504:
+      return new ServiceUnavailableError(provider, statusCode, message);
+  }
+  if (isModelNotFoundMessage(message)) {
+    return new ModelNotFoundError(model, provider, 404);
+  }
+  if (isInsufficientCreditsMessage(message)) {
+    return new InsufficientCreditsError(provider, message);
+  }
+  const lowerMessage = message.toLowerCase();
+  if (lowerMessage.includes("rate limit") || lowerMessage.includes("rate_limit") || lowerMessage.includes("too many requests")) {
+    return new RateLimitError3(provider, void 0, message);
+  }
+  if (lowerMessage.includes("unauthorized") || lowerMessage.includes("api key") || lowerMessage.includes("apikey") || lowerMessage.includes("authentication") || lowerMessage.includes("invalid_api_key")) {
+    return new AuthenticationError3(provider, message);
+  }
+  return error instanceof Error ? error : new Error(message);
+}
 
 // src/utils/removeContentTags.ts
 function removeContentTags(content, tag) {
@@ -57342,25 +57679,7 @@ var AnthropicEngine = class {
         let content = message;
         return removeContentTags(content, "think");
       } catch (error) {
-        const err = error;
-        if (err.message?.toLowerCase().includes("model") && (err.message?.toLowerCase().includes("not found") || err.message?.toLowerCase().includes("does not exist") || err.message?.toLowerCase().includes("invalid"))) {
-          throw new ModelNotFoundError(this.config.model, "anthropic", 404);
-        }
-        if ("status" in error && error.status === 404) {
-          throw new ModelNotFoundError(this.config.model, "anthropic", 404);
-        }
-        ce(`${source_default.red("\u2716")} ${err?.message || err}`);
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const anthropicAiError = error.response.data.error;
-          if (anthropicAiError?.message) ce(anthropicAiError.message);
-          ce(
-            "For help look into README https://github.com/di-sukharev/opencommit#setup"
-          );
-        }
-        if (axios_default.isAxiosError(error) && error.response?.status === 404) {
-          throw new ModelNotFoundError(this.config.model, "anthropic", 404);
-        }
-        throw err;
+        throw normalizeEngineError(error, "anthropic", this.config.model);
       }
     };
     this.config = config7;
@@ -61176,7 +61495,6 @@ var OpenAIClient = class {
 };
 
 // src/engine/azure.ts
-init_dist2();
 var AzureEngine = class {
   constructor(config7) {
     this.generateCommitMessage = async (messages) => {
@@ -61196,17 +61514,7 @@ var AzureEngine = class {
         let content = message?.content;
         return removeContentTags(content, "think");
       } catch (error) {
-        ce(`${source_default.red("\u2716")} ${this.config.model}`);
-        const err = error;
-        ce(`${source_default.red("\u2716")} ${JSON.stringify(error)}`);
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const openAiError = error.response.data.error;
-          if (openAiError?.message) ce(openAiError.message);
-          ce(
-            "For help look into README https://github.com/di-sukharev/opencommit#setup"
-          );
-        }
-        throw err;
+        throw normalizeEngineError(error, "azure", this.config.model);
       }
     };
     this.config = config7;
@@ -61240,9 +61548,8 @@ var FlowiseEngine = class {
       const message = response.data;
       let content = message?.text;
       return removeContentTags(content, "think");
-    } catch (err) {
-      const message = err.response?.data?.error ?? err.message;
-      throw new Error("local model issues. details: " + message);
+    } catch (error) {
+      throw normalizeEngineError(error, "flowise", this.config.model);
     }
   }
 };
@@ -62102,18 +62409,7 @@ var GeminiEngine = class {
       const content = result.response.text();
       return removeContentTags(content, "think");
     } catch (error) {
-      const err = error;
-      if (err.message?.toLowerCase().includes("model") && (err.message?.toLowerCase().includes("not found") || err.message?.toLowerCase().includes("does not exist") || err.message?.toLowerCase().includes("invalid"))) {
-        throw new ModelNotFoundError(this.config.model, "gemini", 404);
-      }
-      if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-        const geminiError = error.response.data.error;
-        if (geminiError) throw new Error(geminiError?.message);
-      }
-      if (axios_default.isAxiosError(error) && error.response?.status === 404) {
-        throw new ModelNotFoundError(this.config.model, "gemini", 404);
-      }
-      throw err;
+      throw normalizeEngineError(error, "gemini", this.config.model);
     }
   }
 };
@@ -62146,15 +62442,8 @@ var OllamaEngine = class {
       const { message } = response.data;
       let content = message?.content;
       return removeContentTags(content, "think");
-    } catch (err) {
-      const message = err.response?.data?.error ?? err.message;
-      if (message?.toLowerCase().includes("model") && (message?.toLowerCase().includes("not found") || message?.toLowerCase().includes("does not exist") || message?.toLowerCase().includes("pull"))) {
-        throw new ModelNotFoundError(this.config.model, "ollama", 404);
-      }
-      if (err.response?.status === 404) {
-        throw new ModelNotFoundError(this.config.model, "ollama", 404);
-      }
-      throw new Error(`Ollama provider error: ${message}`);
+    } catch (error) {
+      throw normalizeEngineError(error, "ollama", this.config.model);
     }
   }
 };
@@ -62166,7 +62455,7 @@ __export(error_exports2, {
   APIConnectionTimeoutError: () => APIConnectionTimeoutError3,
   APIError: () => APIError3,
   APIUserAbortError: () => APIUserAbortError3,
-  AuthenticationError: () => AuthenticationError3,
+  AuthenticationError: () => AuthenticationError4,
   BadRequestError: () => BadRequestError3,
   ConflictError: () => ConflictError3,
   ContentFilterFinishReasonError: () => ContentFilterFinishReasonError,
@@ -62175,7 +62464,7 @@ __export(error_exports2, {
   NotFoundError: () => NotFoundError3,
   OpenAIError: () => OpenAIError,
   PermissionDeniedError: () => PermissionDeniedError3,
-  RateLimitError: () => RateLimitError3,
+  RateLimitError: () => RateLimitError4,
   UnprocessableEntityError: () => UnprocessableEntityError3
 });
 
@@ -63447,7 +63736,7 @@ var APIError3 = class _APIError extends OpenAIError {
       return new BadRequestError3(status, error, message, headers);
     }
     if (status === 401) {
-      return new AuthenticationError3(status, error, message, headers);
+      return new AuthenticationError4(status, error, message, headers);
     }
     if (status === 403) {
       return new PermissionDeniedError3(status, error, message, headers);
@@ -63462,7 +63751,7 @@ var APIError3 = class _APIError extends OpenAIError {
       return new UnprocessableEntityError3(status, error, message, headers);
     }
     if (status === 429) {
-      return new RateLimitError3(status, error, message, headers);
+      return new RateLimitError4(status, error, message, headers);
     }
     if (status >= 500) {
       return new InternalServerError3(status, error, message, headers);
@@ -63495,7 +63784,7 @@ var BadRequestError3 = class extends APIError3 {
     this.status = 400;
   }
 };
-var AuthenticationError3 = class extends APIError3 {
+var AuthenticationError4 = class extends APIError3 {
   constructor() {
     super(...arguments);
     this.status = 401;
@@ -63525,7 +63814,7 @@ var UnprocessableEntityError3 = class extends APIError3 {
     this.status = 422;
   }
 };
-var RateLimitError3 = class extends APIError3 {
+var RateLimitError4 = class extends APIError3 {
   constructor() {
     super(...arguments);
     this.status = 429;
@@ -66834,15 +67123,15 @@ OpenAI.APIConnectionTimeoutError = APIConnectionTimeoutError3;
 OpenAI.APIUserAbortError = APIUserAbortError3;
 OpenAI.NotFoundError = NotFoundError3;
 OpenAI.ConflictError = ConflictError3;
-OpenAI.RateLimitError = RateLimitError3;
+OpenAI.RateLimitError = RateLimitError4;
 OpenAI.BadRequestError = BadRequestError3;
-OpenAI.AuthenticationError = AuthenticationError3;
+OpenAI.AuthenticationError = AuthenticationError4;
 OpenAI.InternalServerError = InternalServerError3;
 OpenAI.PermissionDeniedError = PermissionDeniedError3;
 OpenAI.UnprocessableEntityError = UnprocessableEntityError3;
 OpenAI.toFile = toFile2;
 OpenAI.fileFromPath = fileFromPath4;
-var { OpenAIError: OpenAIError2, APIError: APIError4, APIConnectionError: APIConnectionError4, APIConnectionTimeoutError: APIConnectionTimeoutError4, APIUserAbortError: APIUserAbortError4, NotFoundError: NotFoundError4, ConflictError: ConflictError4, RateLimitError: RateLimitError4, BadRequestError: BadRequestError4, AuthenticationError: AuthenticationError4, InternalServerError: InternalServerError4, PermissionDeniedError: PermissionDeniedError4, UnprocessableEntityError: UnprocessableEntityError4 } = error_exports2;
+var { OpenAIError: OpenAIError2, APIError: APIError4, APIConnectionError: APIConnectionError4, APIConnectionTimeoutError: APIConnectionTimeoutError4, APIUserAbortError: APIUserAbortError4, NotFoundError: NotFoundError4, ConflictError: ConflictError4, RateLimitError: RateLimitError5, BadRequestError: BadRequestError4, AuthenticationError: AuthenticationError5, InternalServerError: InternalServerError4, PermissionDeniedError: PermissionDeniedError4, UnprocessableEntityError: UnprocessableEntityError4 } = error_exports2;
 (function(OpenAI2) {
   OpenAI2.Page = Page;
   OpenAI2.CursorPage = CursorPage;
@@ -66883,21 +67172,7 @@ var OpenAiEngine = class {
         let content = message?.content;
         return removeContentTags(content, "think");
       } catch (error) {
-        const err = error;
-        if (err.message?.toLowerCase().includes("model") && (err.message?.toLowerCase().includes("not found") || err.message?.toLowerCase().includes("does not exist") || err.message?.toLowerCase().includes("invalid"))) {
-          throw new ModelNotFoundError(this.config.model, "openai", 404);
-        }
-        if ("status" in error && error.status === 404) {
-          throw new ModelNotFoundError(this.config.model, "openai", 404);
-        }
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const openAiError = error.response.data.error;
-          if (openAiError) throw new Error(openAiError.message);
-        }
-        if (axios_default.isAxiosError(error) && error.response?.status === 404) {
-          throw new ModelNotFoundError(this.config.model, "openai", 404);
-        }
-        throw err;
+        throw normalizeEngineError(error, "openai", this.config.model);
       }
     };
     this.config = config7;
@@ -66941,12 +67216,7 @@ var MistralAiEngine = class {
         let content = message.content;
         return removeContentTags(content, "think");
       } catch (error) {
-        const err = error;
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const mistralError = error.response.data.error;
-          if (mistralError) throw new Error(mistralError.message);
-        }
-        throw err;
+        throw normalizeEngineError(error, "mistral", this.config.model);
       }
     };
     this.config = config7;
@@ -66995,9 +67265,8 @@ var MLXEngine = class {
       const message = choices[0].message;
       let content = message?.content;
       return removeContentTags(content, "think");
-    } catch (err) {
-      const message = err.response?.data?.error ?? err.message;
-      throw new Error(`MLX provider error: ${message}`);
+    } catch (error) {
+      throw normalizeEngineError(error, "mlx", this.config.model);
     }
   }
 };
@@ -67027,12 +67296,7 @@ var DeepseekEngine = class extends OpenAiEngine {
         let content = message?.content;
         return removeContentTags(content, "think");
       } catch (error) {
-        const err = error;
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const openAiError = error.response.data.error;
-          if (openAiError) throw new Error(openAiError.message);
-        }
-        throw err;
+        throw normalizeEngineError(error, "deepseek", this.config.model);
       }
     };
   }
@@ -67051,12 +67315,7 @@ var AimlApiEngine = class {
         const message = response.data.choices?.[0]?.message;
         return message?.content ?? null;
       } catch (error) {
-        const err = error;
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const apiError = error.response.data.error;
-          if (apiError) throw new Error(apiError.message);
-        }
-        throw err;
+        throw normalizeEngineError(error, "aimlapi", this.config.model);
       }
     };
     this.client = axios_default.create({
@@ -67086,12 +67345,7 @@ var OpenRouterEngine = class {
         let content = message?.content;
         return removeContentTags(content, "think");
       } catch (error) {
-        const err = error;
-        if (axios_default.isAxiosError(error) && error.response?.status === 401) {
-          const openRouterError = error.response.data.error;
-          if (openRouterError) throw new Error(openRouterError.message);
-        }
-        throw err;
+        throw normalizeEngineError(error, "openrouter", this.config.model);
       }
     };
     this.client = axios_default.create({
@@ -68153,9 +68407,10 @@ ${source_default.grey("\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2
     commitGenerationSpinner.stop(
       `${source_default.red("\u2716")} Failed to generate the commit message`
     );
-    console.log(error);
-    const err = error;
-    ce(`${source_default.red("\u2716")} ${err?.message || err}`);
+    const errorConfig = getConfig();
+    const provider = errorConfig.OCO_AI_PROVIDER || "openai";
+    const formatted = formatUserFriendlyError(error, provider);
+    ce(printFormattedError(formatted));
     process.exit(1);
   }
 };
@@ -68458,9 +68713,97 @@ async function fetchOllamaModels(baseUrl = "http://localhost:11434") {
     return [];
   }
 }
-async function fetchModelsForProvider(provider, apiKey, baseUrl) {
+async function fetchAnthropicModels(apiKey) {
+  try {
+    const response = await fetch("https://api.anthropic.com/v1/models", {
+      headers: {
+        "x-api-key": apiKey,
+        "anthropic-version": "2023-06-01"
+      }
+    });
+    if (!response.ok) {
+      return MODEL_LIST.anthropic;
+    }
+    const data = await response.json();
+    const models = data.data?.map((m5) => m5.id).filter((id) => id.startsWith("claude-")).sort();
+    return models && models.length > 0 ? models : MODEL_LIST.anthropic;
+  } catch {
+    return MODEL_LIST.anthropic;
+  }
+}
+async function fetchMistralModels(apiKey) {
+  try {
+    const response = await fetch("https://api.mistral.ai/v1/models", {
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+    if (!response.ok) {
+      return MODEL_LIST.mistral;
+    }
+    const data = await response.json();
+    const models = data.data?.map((m5) => m5.id).sort();
+    return models && models.length > 0 ? models : MODEL_LIST.mistral;
+  } catch {
+    return MODEL_LIST.mistral;
+  }
+}
+async function fetchGroqModels(apiKey) {
+  try {
+    const response = await fetch("https://api.groq.com/openai/v1/models", {
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+    if (!response.ok) {
+      return MODEL_LIST.groq;
+    }
+    const data = await response.json();
+    const models = data.data?.map((m5) => m5.id).sort();
+    return models && models.length > 0 ? models : MODEL_LIST.groq;
+  } catch {
+    return MODEL_LIST.groq;
+  }
+}
+async function fetchOpenRouterModels(apiKey) {
+  try {
+    const response = await fetch("https://openrouter.ai/api/v1/models", {
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+    if (!response.ok) {
+      return MODEL_LIST.openrouter;
+    }
+    const data = await response.json();
+    const models = data.data?.filter(
+      (m5) => m5.context_length && m5.context_length > 0
+    ).map((m5) => m5.id).sort();
+    return models && models.length > 0 ? models : MODEL_LIST.openrouter;
+  } catch {
+    return MODEL_LIST.openrouter;
+  }
+}
+async function fetchDeepSeekModels(apiKey) {
+  try {
+    const response = await fetch("https://api.deepseek.com/v1/models", {
+      headers: {
+        Authorization: `Bearer ${apiKey}`
+      }
+    });
+    if (!response.ok) {
+      return MODEL_LIST.deepseek;
+    }
+    const data = await response.json();
+    const models = data.data?.map((m5) => m5.id).sort();
+    return models && models.length > 0 ? models : MODEL_LIST.deepseek;
+  } catch {
+    return MODEL_LIST.deepseek;
+  }
+}
+async function fetchModelsForProvider(provider, apiKey, baseUrl, forceRefresh = false) {
   const cache = readCache();
-  if (isCacheValid(cache) && cache.models[provider]) {
+  if (!forceRefresh && isCacheValid(cache) && cache.models[provider]) {
     return cache.models[provider];
   }
   let models = [];
@@ -68476,25 +68819,45 @@ async function fetchModelsForProvider(provider, apiKey, baseUrl) {
       models = await fetchOllamaModels(baseUrl);
       break;
     case "anthropic" /* ANTHROPIC */:
-      models = MODEL_LIST.anthropic;
+      if (apiKey) {
+        models = await fetchAnthropicModels(apiKey);
+      } else {
+        models = MODEL_LIST.anthropic;
+      }
       break;
     case "gemini" /* GEMINI */:
       models = MODEL_LIST.gemini;
       break;
     case "groq" /* GROQ */:
-      models = MODEL_LIST.groq;
+      if (apiKey) {
+        models = await fetchGroqModels(apiKey);
+      } else {
+        models = MODEL_LIST.groq;
+      }
       break;
     case "mistral" /* MISTRAL */:
-      models = MODEL_LIST.mistral;
+      if (apiKey) {
+        models = await fetchMistralModels(apiKey);
+      } else {
+        models = MODEL_LIST.mistral;
+      }
       break;
     case "deepseek" /* DEEPSEEK */:
-      models = MODEL_LIST.deepseek;
+      if (apiKey) {
+        models = await fetchDeepSeekModels(apiKey);
+      } else {
+        models = MODEL_LIST.deepseek;
+      }
       break;
     case "aimlapi" /* AIMLAPI */:
       models = MODEL_LIST.aimlapi;
       break;
     case "openrouter" /* OPENROUTER */:
-      models = MODEL_LIST.openrouter;
+      if (apiKey) {
+        models = await fetchOpenRouterModels(apiKey);
+      } else {
+        models = MODEL_LIST.openrouter;
+      }
       break;
     default:
       models = MODEL_LIST.openai;
@@ -68504,6 +68867,31 @@ async function fetchModelsForProvider(provider, apiKey, baseUrl) {
   writeCache(existingCache);
   return models;
 }
+function clearModelCache() {
+  try {
+    if ((0, import_fs5.existsSync)(MODEL_CACHE_PATH)) {
+      (0, import_fs5.writeFileSync)(MODEL_CACHE_PATH, "{}", "utf8");
+    }
+  } catch {
+  }
+}
+function getCacheInfo() {
+  const cache = readCache();
+  if (!cache) {
+    return { timestamp: null, providers: [] };
+  }
+  return {
+    timestamp: cache.timestamp,
+    providers: Object.keys(cache.models || {})
+  };
+}
+function getCachedModels(provider) {
+  const cache = readCache();
+  if (!cache || !cache.models[provider]) {
+    return null;
+  }
+  return cache.models[provider];
+}
 
 // src/commands/setup.ts
 var PROVIDER_DISPLAY_NAMES = {
@@ -68582,17 +68970,42 @@ ${source_default.dim(`  Get your key at: ${url2}`)}`;
     }
   });
 }
+function formatCacheAge(timestamp) {
+  if (!timestamp) return "";
+  const ageMs = Date.now() - timestamp;
+  const days = Math.floor(ageMs / (1e3 * 60 * 60 * 24));
+  const hours = Math.floor(ageMs / (1e3 * 60 * 60));
+  if (days > 0) {
+    return `${days} day${days === 1 ? "" : "s"} ago`;
+  } else if (hours > 0) {
+    return `${hours} hour${hours === 1 ? "" : "s"} ago`;
+  }
+  return "just now";
+}
 async function selectModel(provider, apiKey) {
+  const providerDisplayName = PROVIDER_DISPLAY_NAMES[provider]?.split(" (")[0] || provider;
   const loadingSpinner = le();
-  loadingSpinner.start("Fetching available models...");
+  loadingSpinner.start(`Fetching models from ${providerDisplayName}...`);
   let models = [];
+  let usedFallback = false;
   try {
     models = await fetchModelsForProvider(provider, apiKey);
   } catch {
+    usedFallback = true;
     const providerKey = provider.toLowerCase();
     models = MODEL_LIST[providerKey] || [];
   }
-  loadingSpinner.stop("Models loaded");
+  const cacheInfo = getCacheInfo();
+  const cacheAge = formatCacheAge(cacheInfo.timestamp);
+  if (usedFallback) {
+    loadingSpinner.stop(
+      source_default.yellow("Could not fetch models from API. Using default list.")
+    );
+  } else if (cacheAge) {
+    loadingSpinner.stop(`Models loaded ${source_default.dim(`(cached ${cacheAge})`)}`);
+  } else {
+    loadingSpinner.stop("Models loaded");
+  }
   if (models.length === 0) {
     if (NO_API_KEY_PROVIDERS.includes(provider)) {
       return await J4({
@@ -68844,6 +69257,116 @@ var setupCommand = G3(
   }
 );
 
+// src/commands/models.ts
+init_dist2();
+function formatCacheAge2(timestamp) {
+  if (!timestamp) return "never";
+  const ageMs = Date.now() - timestamp;
+  const days = Math.floor(ageMs / (1e3 * 60 * 60 * 24));
+  const hours = Math.floor(ageMs / (1e3 * 60 * 60));
+  const minutes = Math.floor(ageMs / (1e3 * 60));
+  if (days > 0) {
+    return `${days} day${days === 1 ? "" : "s"} ago`;
+  } else if (hours > 0) {
+    return `${hours} hour${hours === 1 ? "" : "s"} ago`;
+  } else if (minutes > 0) {
+    return `${minutes} minute${minutes === 1 ? "" : "s"} ago`;
+  }
+  return "just now";
+}
+async function listModels(provider, useCache = true) {
+  const config7 = getConfig();
+  const apiKey = config7.OCO_API_KEY;
+  const currentModel = config7.OCO_MODEL;
+  let models = [];
+  if (useCache) {
+    const cached = getCachedModels(provider);
+    if (cached) {
+      models = cached;
+    }
+  }
+  if (models.length === 0) {
+    const providerKey = provider.toLowerCase();
+    models = MODEL_LIST[providerKey] || [];
+  }
+  console.log(`
+${source_default.bold("Available models for")} ${source_default.cyan(provider)}:
+`);
+  if (models.length === 0) {
+    console.log(source_default.dim("  No models found"));
+  } else {
+    models.forEach((model) => {
+      const isCurrent = model === currentModel;
+      const prefix = isCurrent ? source_default.green("* ") : "  ";
+      const label = isCurrent ? source_default.green(model) : model;
+      console.log(`${prefix}${label}`);
+    });
+  }
+  console.log("");
+}
+async function refreshModels(provider) {
+  const config7 = getConfig();
+  const apiKey = config7.OCO_API_KEY;
+  const loadingSpinner = le();
+  loadingSpinner.start(`Fetching models from ${provider}...`);
+  clearModelCache();
+  try {
+    const models = await fetchModelsForProvider(provider, apiKey, void 0, true);
+    loadingSpinner.stop(`${source_default.green("+")} Fetched ${models.length} models`);
+    await listModels(provider, true);
+  } catch (error) {
+    loadingSpinner.stop(source_default.red("Failed to fetch models"));
+    console.error(source_default.red(`Error: ${error instanceof Error ? error.message : "Unknown error"}`));
+  }
+}
+var modelsCommand = G3(
+  {
+    name: "models" /* models */,
+    help: {
+      description: "List and manage cached models for your AI provider"
+    },
+    flags: {
+      refresh: {
+        type: Boolean,
+        alias: "r",
+        description: "Clear cache and re-fetch models from the provider",
+        default: false
+      },
+      provider: {
+        type: String,
+        alias: "p",
+        description: "Specify provider (defaults to current OCO_AI_PROVIDER)"
+      }
+    }
+  },
+  async ({ flags }) => {
+    const config7 = getConfig();
+    const provider = flags.provider || config7.OCO_AI_PROVIDER || "openai" /* OPENAI */;
+    ae(source_default.bgCyan(" OpenCommit Models "));
+    const cacheInfo = getCacheInfo();
+    if (cacheInfo.timestamp) {
+      console.log(
+        source_default.dim(`  Cache last updated: ${formatCacheAge2(cacheInfo.timestamp)}`)
+      );
+      if (cacheInfo.providers.length > 0) {
+        console.log(
+          source_default.dim(`  Cached providers: ${cacheInfo.providers.join(", ")}`)
+        );
+      }
+    } else {
+      console.log(source_default.dim("  No cached models"));
+    }
+    if (flags.refresh) {
+      await refreshModels(provider);
+    } else {
+      await listModels(provider);
+    }
+    ce(
+      `Run ${source_default.cyan("oco models --refresh")} to update the model list`
+    );
+  }
+);
+
 // src/utils/checkIsLatestVersion.ts
 init_dist2();
 
@@ -69036,7 +69559,7 @@ Z2(
   {
     version: package_default.version,
     name: "opencommit",
-    commands: [configCommand, hookCommand, commitlintConfigCommand, setupCommand],
+    commands: [configCommand, hookCommand, commitlintConfigCommand, setupCommand, modelsCommand],
     flags: {
       fgm: {
         type: Boolean,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencommit",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
   "keywords": [
     "git",