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
1 change: 1 addition & 0 deletions .changelog/next/changed-agent-5ad8ec54.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- AI provider settings support a configurable default reasoning effort level
24 changes: 23 additions & 1 deletion client/src/pages/AIProviders.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AlertTriangle } from 'lucide-react';
import toast from '../components/ui/Toast';
import * as api from '../services/api';
import socket from '../services/socket';
import { filterSelectableModels, filterGenerationModels, isEmbeddingModel, mergeModelLists, configuredDefaultIn, localBackendForProvider, modelOptionLabel, providerTypeClass, isTuiProvider, isApiProvider, isProcessProvider, supportsModelRefresh, isGrokBuildCli, isLocalEndpoint, effectiveModelContextWindow, isRunnerAllowedCommand } from '../utils/providers';
import { filterSelectableModels, filterGenerationModels, isEmbeddingModel, mergeModelLists, configuredDefaultIn, localBackendForProvider, modelOptionLabel, providerTypeClass, isTuiProvider, isApiProvider, isProcessProvider, supportsModelRefresh, isGrokBuildCli, isLocalEndpoint, effectiveModelContextWindow, isRunnerAllowedCommand, effortLevelsForProvider } from '../utils/providers';
import useLocalModels from '../hooks/useLocalModels';
import BrailleSpinner from '../components/BrailleSpinner';
import EmptyState from '../components/EmptyState';
Expand All @@ -19,6 +19,7 @@ import {
} from '../utils/formatters';
import SettingsTabsHeader from '../components/settings/SettingsTabsHeader';
import CodeReviewDefaultsPanel from '../components/providers/CodeReviewDefaultsPanel';
import EffortSelect from '../components/cos/EffortSelect';
import Modal from '../components/ui/Modal';
import { FormField } from '../components/ui/FormField';

Expand Down Expand Up @@ -607,6 +608,9 @@ export default function AIProviders() {
{provider.defaultModel && (
<p className="break-words">Default: <code className="text-gray-300 break-all">{provider.defaultModel}</code></p>
)}
{provider.effort && (
<p className="break-words">Default effort: <code className="text-gray-300">{provider.effort}</code></p>
)}
{(() => {
const windowLabel = formatContextLength(effectiveModelContextWindow(provider, provider.defaultModel));
return windowLabel ? (
Expand Down Expand Up @@ -794,6 +798,7 @@ function ProviderForm({ provider, onClose, onSave, allProviders = [], runnerAllo
allowCustomEndpoint: provider?.allowCustomEndpoint === true,
models: provider?.models || [],
defaultModel: provider?.defaultModel || '',
effort: provider?.effort || '',
lightModel: provider?.lightModel || '',
mediumModel: provider?.mediumModel || '',
heavyModel: provider?.heavyModel || '',
Expand Down Expand Up @@ -835,6 +840,7 @@ function ProviderForm({ provider, onClose, onSave, allProviders = [], runnerAllo
// option for it the four selects below would hold a value matching no option
// and render blank — reading as "no model configured" when one is.
const configuredDefault = configuredDefaultIn(mergedModels);
const effortProvider = { ...formData, id: provider?.id, models: mergedModels };
// Shared option list for the Default Model + Light/Medium/Heavy tier selects,
// so the sentinel option can't be added to some and missed on others.
const modelSelectOptions = (
Expand Down Expand Up @@ -900,6 +906,13 @@ function ProviderForm({ provider, onClose, onSave, allProviders = [], runnerAllo
for (const field of ['defaultModel', 'lightModel', 'mediumModel', 'heavyModel', 'fallbackModel']) {
if (isEmbeddingModel(data[field])) data[field] = '';
}
// Effort is meaningful only for providers/models that expose an effort
// ladder. Clear a stale value when an edit switches to an effort-less
// provider or Antigravity model; narrowed ladders are clamped by the
// server and remain visible in the selector.
if (!isProcessProvider(data) || !effortLevelsForProvider({ ...data, id: provider?.id }, data.defaultModel)) {
data.effort = '';
}
if (parsedTimeout != null) {
data.timeout = parsedTimeout;
} else if (timeoutInput === '') {
Expand Down Expand Up @@ -1150,6 +1163,15 @@ function ProviderForm({ provider, onClose, onSave, allProviders = [], runnerAllo
</p>
</FormField>

<EffortSelect
provider={isProcessProvider(formData) ? effortProvider : null}
model={formData.defaultModel}
value={formData.effort}
onChange={(effort) => setFormData(prev => ({ ...prev, effort }))}
label="Default Effort"
hint="Reasoning effort used when a run does not specify one."
/>

{/* Model Tiers */}
<div className="border-t border-port-border pt-4 mt-4">
<h4 className="text-sm font-medium text-gray-300 mb-3">Model Tiers</h4>
Expand Down
35 changes: 33 additions & 2 deletions client/src/pages/AIProviders.test.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
import { MemoryRouter } from 'react-router';

const api = vi.hoisted(() => ({
Expand All @@ -9,6 +9,7 @@ const api = vi.hoisted(() => ({
getProviderStatuses: vi.fn(),
getSampleProviders: vi.fn(),
createProvider: vi.fn(),
updateProvider: vi.fn(),
}));

const toast = vi.hoisted(() => ({
Expand Down Expand Up @@ -260,5 +261,35 @@ describe('CoS Agent Runner allowlist warning', () => {
expect(await screen.findByText(/command allowlist/)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Save' })).not.toBeDisabled();
});
});

it('shows the provider default-effort selector for an effort-capable provider', async () => {
api.getProviders.mockResolvedValue({
providers: [{
id: 'codex',
name: 'Codex',
type: 'cli',
command: 'codex',
enabled: true,
models: ['gpt-5'],
defaultModel: 'gpt-5',
effort: '',
}],
activeProvider: 'codex',
});

renderPage();

fireEvent.click(await screen.findByRole('button', { name: 'Edit' }));

const effort = await screen.findByLabelText('Default Effort');
expect(effort).toHaveValue('');
fireEvent.change(effort, { target: { value: 'xhigh' } });
expect(effort).toHaveValue('xhigh');

fireEvent.click(screen.getByRole('button', { name: 'Save' }));
await waitFor(() => expect(api.updateProvider).toHaveBeenCalledWith(
'codex',
expect.objectContaining({ effort: 'xhigh' }),
));
});
});
1 change: 1 addition & 0 deletions server/lib/aiToolkit/providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ export function createProviderService(config = {}) {
apiKey: providerData.apiKey || '',
models: providerData.models || [],
defaultModel: providerData.defaultModel || null,
effort: providerData.effort || null,
lightModel: providerData.lightModel || null,
mediumModel: providerData.mediumModel || null,
heavyModel: providerData.heavyModel || null,
Expand Down
1 change: 1 addition & 0 deletions server/lib/aiToolkit/providers.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ describe('Provider Service', () => {
apiKey: 'sk-test-secret',
models: ['model-a', 'model-b', 'model-c'],
defaultModel: 'model-a',
effort: 'xhigh',
lightModel: 'model-b',
mediumModel: 'model-a',
heavyModel: 'model-c',
Expand Down
13 changes: 13 additions & 0 deletions server/lib/aiToolkit/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ import { MAX_TIMEOUT, MIN_TIMEOUT } from './constants.js';
// rejected.
const ALLOWED_SCREENSHOT_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp']);

// Reasoning-effort values accepted by the effort-capable CLI providers. Keep
// this local because the vendored toolkit must remain self-contained; the
// runtime mirror lives in server/lib/providerModels.js and the UI mirror lives
// in client/src/utils/providers.js.
const PROVIDER_EFFORT_LEVELS = ['minimal', 'low', 'medium', 'high', 'xhigh', 'max', 'ultra'];

const providerEffort = z.preprocess(
(value) => (typeof value === 'string' && value.trim() === '' ? null : value),
z.enum(PROVIDER_EFFORT_LEVELS).nullable().optional()
);

/**
* Sanitize the untrusted `screenshots[]` array from POST /api/runs into safe,
* screenshots-dir-relative basenames. `screenshots[]` is unauthenticated user
Expand Down Expand Up @@ -63,6 +74,8 @@ export const providerSchema = z.object({
apiKey: z.string().optional(),
models: z.array(z.string()).optional(),
defaultModel: z.string().nullable().optional(),
// Empty string is the UI's "use the provider/CLI default" sentinel.
effort: providerEffort,
lightModel: z.string().nullable().optional(),
mediumModel: z.string().nullable().optional(),
heavyModel: z.string().nullable().optional(),
Expand Down
13 changes: 13 additions & 0 deletions server/lib/aiToolkit/validation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,19 @@ describe('providerSchema', () => {
});
});

describe('default reasoning effort', () => {
it('accepts known effort levels and treats an empty UI value as unset', () => {
expect(providerSchema.safeParse({ ...minimalProvider, effort: 'xhigh' }).success).toBe(true);
const empty = providerSchema.safeParse({ ...minimalProvider, effort: '' });
expect(empty.success).toBe(true);
expect(empty.data.effort).toBeNull();
});

it('rejects an unknown effort level', () => {
expect(providerSchema.safeParse({ ...minimalProvider, effort: 'turbo' }).success).toBe(false);
});
});

describe('type enum + required name', () => {
it('rejects an unknown type and a missing/empty name', () => {
expect(providerSchema.safeParse({ name: 'X', type: 'magic' }).success).toBe(false);
Expand Down