Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions out/cli.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -65273,7 +65273,7 @@ function G3(t2, e3) {
// package.json
var package_default = {
name: "opencommit",
version: "3.3.2",
version: "3.3.5",
description: "Auto-generate impressive commits in 1 second. Killing lame commits with AI \u{1F92F}\u{1F52B}",
keywords: [
"git",
Expand Down Expand Up @@ -67360,11 +67360,10 @@ var MODEL_LIST = {
"gpt-4o-mini-2024-07-18"
],
anthropic: [
"claude-sonnet-4-20250514",
"claude-opus-4-20250514",
"claude-3-7-sonnet-20250219",
"claude-3-5-sonnet-20241022",
"claude-3-5-haiku-20241022"
"claude-sonnet-4-6",
"claude-opus-4-8",
"claude-sonnet-4-5-20250929",
"claude-haiku-4-5-20251001"
],
gemini: [
"gemini-1.5-flash",
Expand Down Expand Up @@ -68135,7 +68134,7 @@ var PROVIDER_API_KEY_URLS = {
};
var RECOMMENDED_MODELS = {
["openai" /* OPENAI */]: "gpt-4o-mini",
["anthropic" /* ANTHROPIC */]: "claude-sonnet-4-20250514",
["anthropic" /* ANTHROPIC */]: "claude-sonnet-4-6",
["gemini" /* GEMINI */]: "gemini-1.5-flash",
["groq" /* GROQ */]: "llama3-70b-8192",
["mistral" /* MISTRAL */]: "mistral-small-latest",
Expand Down Expand Up @@ -74695,7 +74694,7 @@ function extractErrorMessage(error) {
}
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");
return lowerMessage.includes("model") && (lowerMessage.includes("not found") || lowerMessage.includes("does not exist") || lowerMessage.includes("pull")) || lowerMessage.includes("does_not_exist");
}
function isInsufficientCreditsMessage(message) {
const lowerMessage = message.toLowerCase();
Expand Down Expand Up @@ -74726,6 +74725,9 @@ function normalizeEngineError(error, provider, model) {
case 504:
return new ServiceUnavailableError(provider, statusCode, message);
}
if (statusCode === 400) {
return error instanceof Error ? error : new Error(message);
}
if (isModelNotFoundMessage(message)) {
return new ModelNotFoundError(model, provider, 404);
}
Expand Down Expand Up @@ -74816,7 +74818,7 @@ var AnthropicEngine = class {
temperature: 0,
max_tokens: this.config.maxTokensOutput
};
if (!/claude.*-4-5/.test(params.model)) {
if (!/claude.*-4-(?:5|[6-9])/.test(params.model)) {
params.top_p = 0.1;
}
try {
Expand Down Expand Up @@ -84644,6 +84646,9 @@ var OpenAiEngine = class {
clientOptions.defaultHeaders = headers;
}
}
if (!clientOptions.fetch && typeof globalThis.fetch === "function") {
clientOptions.fetch = (...args) => globalThis.fetch(...args);
}
this.client = new OpenAI(clientOptions);
}
};
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opencommit",
"version": "3.3.2",
"version": "3.3.5",
"description": "Auto-generate impressive commits in 1 second. Killing lame commits with AI 🤯🔫",
"keywords": [
"git",
Expand Down
11 changes: 5 additions & 6 deletions src/commands/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,10 @@ export const MODEL_LIST = {
],

anthropic: [
'claude-sonnet-4-20250514',
'claude-opus-4-20250514',
'claude-3-7-sonnet-20250219',
'claude-3-5-sonnet-20241022',
'claude-3-5-haiku-20241022'
'claude-sonnet-4-6',
'claude-opus-4-8',
'claude-sonnet-4-5-20250929',
'claude-haiku-4-5-20251001'
],

gemini: [
Expand Down Expand Up @@ -893,7 +892,7 @@ export const PROVIDER_API_KEY_URLS: Record<string, string | null> = {

export const RECOMMENDED_MODELS: Record<string, string> = {
[OCO_AI_PROVIDER_ENUM.OPENAI]: 'gpt-4o-mini',
[OCO_AI_PROVIDER_ENUM.ANTHROPIC]: 'claude-sonnet-4-20250514',
[OCO_AI_PROVIDER_ENUM.ANTHROPIC]: 'claude-sonnet-4-6',
[OCO_AI_PROVIDER_ENUM.GEMINI]: 'gemini-1.5-flash',
[OCO_AI_PROVIDER_ENUM.GROQ]: 'llama3-70b-8192',
[OCO_AI_PROVIDER_ENUM.MISTRAL]: 'mistral-small-latest',
Expand Down
4 changes: 2 additions & 2 deletions src/engine/anthropic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export class AnthropicEngine implements AiEngine {
max_tokens: this.config.maxTokensOutput
};

// add top_p for non-4.5 models
if (!/claude.*-4-5/.test(params.model)) {
// Anthropic rejects simultaneous temperature and top_p on Claude 4.5+
if (!/claude.*-4-(?:5|[6-9])/.test(params.model)) {
params.top_p = 0.1;
}

Expand Down
9 changes: 9 additions & 0 deletions src/engine/openAi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ export class OpenAiEngine implements AiEngine {
}
}

// The OpenAI SDK's internal fetch may resolve before globalThis.fetch is
// available in some Node.js versions, causing premature connection errors.
// Explicitly binding globalThis.fetch here defers resolution to call time,
// ensuring the runtime's native fetch is used instead of the SDK's bundled
// undici — which also avoids double-initialisation in newer Node (>=18).
if (!clientOptions.fetch && typeof globalThis.fetch === 'function') {
clientOptions.fetch = (...args) => globalThis.fetch(...args);
}

this.client = new OpenAI(clientOptions);
}

Expand Down
5 changes: 4 additions & 1 deletion src/utils/engineErrorHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ function isModelNotFoundMessage(message: string): boolean {
(lowerMessage.includes('model') &&
(lowerMessage.includes('not found') ||
lowerMessage.includes('does not exist') ||
lowerMessage.includes('invalid') ||
lowerMessage.includes('pull'))) ||
lowerMessage.includes('does_not_exist')
);
Expand Down Expand Up @@ -171,6 +170,10 @@ export function normalizeEngineError(
}

// Handle based on error message content
if (statusCode === 400) {
return error instanceof Error ? error : new Error(message);
}

if (isModelNotFoundMessage(message)) {
return new ModelNotFoundError(model, provider, 404);
}
Expand Down
88 changes: 88 additions & 0 deletions test/unit/anthropic.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { OpenAI } from 'openai';
import { AnthropicEngine } from '../../src/engine/anthropic';

describe('AnthropicEngine', () => {
const baseConfig = {
apiKey: 'test-anthropic-key',
maxTokensInput: 4096,
maxTokensOutput: 256
};

const messages: Array<OpenAI.Chat.Completions.ChatCompletionMessageParam> = [
{ role: 'system', content: 'system message' },
{ role: 'user', content: 'diff --git a/file b/file' }
];

it('does not send top_p for Claude 4.5 models', async () => {
const engine = new AnthropicEngine({
...baseConfig,
model: 'claude-haiku-4-5-20251001'
});

const create = jest
.spyOn(engine.client.messages, 'create')
.mockResolvedValue({
content: [{ type: 'text', text: 'feat(theme): update colors' }]
} as any);

await engine.generateCommitMessage(messages);

expect(create).toHaveBeenCalledWith(
expect.objectContaining({
model: 'claude-haiku-4-5-20251001',
temperature: 0,
max_tokens: 256
})
);
expect(create).toHaveBeenCalledWith(
expect.not.objectContaining({
top_p: expect.anything()
})
);
});

it('does not send top_p for Claude 4.6+ models', async () => {
const engine = new AnthropicEngine({
...baseConfig,
model: 'claude-sonnet-4-6'
});

const create = jest
.spyOn(engine.client.messages, 'create')
.mockResolvedValue({
content: [{ type: 'text', text: 'feat(theme): update colors' }]
} as any);

await engine.generateCommitMessage(messages);

expect(create).toHaveBeenCalledWith(
expect.not.objectContaining({
top_p: expect.anything()
})
);
});

it('sends top_p for legacy Claude models', async () => {
const engine = new AnthropicEngine({
...baseConfig,
model: 'claude-sonnet-4-20250514'
});

const create = jest
.spyOn(engine.client.messages, 'create')
.mockResolvedValue({
content: [{ type: 'text', text: 'feat(theme): update colors' }]
} as any);

await engine.generateCommitMessage(messages);

expect(create).toHaveBeenCalledWith(
expect.objectContaining({
model: 'claude-sonnet-4-20250514',
temperature: 0,
top_p: 0.1,
max_tokens: 256
})
);
});
});
37 changes: 37 additions & 0 deletions test/unit/engineErrorHandler.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { normalizeEngineError } from '../../src/utils/engineErrorHandler';
import { ModelNotFoundError } from '../../src/utils/errors';

describe('normalizeEngineError', () => {
it('does not classify Anthropic temperature/top_p 400 as model not found', () => {
const error = Object.assign(
new Error(
'`temperature` and `top_p` cannot both be specified for this model. Please use only one.'
),
{ status: 400 }
);

const normalized = normalizeEngineError(
error,
'anthropic',
'claude-sonnet-4-6'
);

expect(normalized).not.toBeInstanceOf(ModelNotFoundError);
expect(normalized.message).toContain('temperature');
});

it('classifies genuine model-not-found errors', () => {
const error = Object.assign(
new Error('model: claude-sonnet-4-20250514 not found'),
{ status: 404 }
);

const normalized = normalizeEngineError(
error,
'anthropic',
'claude-sonnet-4-20250514'
);

expect(normalized).toBeInstanceOf(ModelNotFoundError);
});
});
Loading