@shipfox/client-agent 5.0.0 → 6.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-agent",
   "license": "MIT",
-  "version": "5.0.0",
+  "version": "6.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -10,10 +10,6 @@
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "imports": {
-    "#*": "./dist/*",
-    "#test/*": "./test/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -32,11 +28,11 @@
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
     "@tanstack/react-query": "^5.101.0",
-    "@shipfox/api-agent-dto": "8.0.0",
-    "@shipfox/client-shell": "5.0.0",
-    "@shipfox/client-api": "4.0.0",
-    "@shipfox/client-ui": "4.0.0",
-    "@shipfox/react-ui": "0.3.5"
+    "@shipfox/api-agent-dto": "9.0.1",
+    "@shipfox/client-api": "6.0.1",
+    "@shipfox/client-shell": "6.0.1",
+    "@shipfox/react-ui": "0.3.6",
+    "@shipfox/client-ui": "6.0.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",
@@ -44,6 +40,9 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/components/available-provider-card.tsx

@@ -1,7 +1,7 @@
-import type {ModelProviderCatalogEntryDto} from '@shipfox/api-agent-dto';
 import {Icon} from '@shipfox/react-ui/icon';
 import {Text} from '@shipfox/react-ui/typography';
 import {cn} from '@shipfox/react-ui/utils';
+import type {SupportedProvider} from '#core/models.js';
 
 const SURFACE_CLASS =
   'overflow-hidden rounded-8 border border-border-neutral-base bg-background-neutral-base';
@@ -10,7 +10,7 @@ export function AvailableProviderCard({
   entry,
   onConfigure,
 }: {
-  entry: ModelProviderCatalogEntryDto;
+  entry: SupportedProvider;
   onConfigure: () => void;
 }) {
   return (

package/src/components/available-providers-grid.tsx

@@ -1,19 +1,19 @@
-import type {ModelProviderCatalogEntryDto} from '@shipfox/api-agent-dto';
 import {Button} from '@shipfox/react-ui/button';
 import {EmptyState} from '@shipfox/react-ui/empty-state';
 import {Icon} from '@shipfox/react-ui/icon';
 import {Input} from '@shipfox/react-ui/input';
 import type {ReactNode} from 'react';
 import {useMemo, useRef, useState} from 'react';
+import type {SupportedProvider} from '#core/models.js';
+import {providerMatchesSearch} from '#core/provider-policy.js';
 import {AvailableProviderCard} from './available-provider-card.js';
-import {providerMatchesSearch} from './provider-search.js';
 
 export const PROVIDER_GRID_CLASS = 'grid grid-cols-2 gap-12 max-[760px]:grid-cols-1';
 
 const SEARCH_VISIBILITY_THRESHOLD = 8;
 const MAX_ECHOED_QUERY_LENGTH = 40;
 
-export function AvailableProvidersGrid<TEntry extends ModelProviderCatalogEntryDto>({
+export function AvailableProvidersGrid<TEntry extends SupportedProvider>({
   entries,
   onSelect,
   trailingCard,

package/src/components/change-default-model-form.tsx

@@ -1,4 +1,3 @@
-import type {ModelProviderConfigDto} from '@shipfox/api-agent-dto';
 import {Button} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
 import {fieldError} from '@shipfox/react-ui/form-field';
@@ -6,6 +5,7 @@ import {ModalBody, ModalFooter} from '@shipfox/react-ui/modal';
 import {Text} from '@shipfox/react-ui/typography';
 import {useForm} from '@tanstack/react-form';
 import {useState} from 'react';
+import type {BuiltinProviderConfig, SupportedProvider} from '#core/models.js';
 import {useUpdateModelProviderDefaultModelMutation} from '#hooks/api/model-providers.js';
 import {
   DefaultModelField,
@@ -13,7 +13,6 @@ import {
   selectedModelForModelPayload,
 } from './default-model-field.js';
 import {modelProviderConfigErrorToFormError} from './form-errors.js';
-import type {SupportedModelProviderCatalogEntry} from './supported-model-provider-catalog-entry.js';
 
 const CHANGE_DEFAULT_MODEL_FORM_ID = 'model-provider-change-default-model-form';
 
@@ -24,21 +23,21 @@ export function ChangeDefaultModelForm({
   onSaved,
 }: {
   workspaceId: string;
-  entry: SupportedModelProviderCatalogEntry;
-  config: ModelProviderConfigDto;
+  entry: SupportedProvider;
+  config: BuiltinProviderConfig;
   onSaved: () => void;
 }) {
   const updateDefaultModel = useUpdateModelProviderDefaultModelMutation();
   const [formError, setFormError] = useState<string | undefined>();
   const form = useForm({
-    defaultValues: {default_model: defaultModelFormValue(config.default_model)},
+    defaultValues: {default_model: defaultModelFormValue(config.defaultModel)},
     onSubmit: async ({value}) => {
       setFormError(undefined);
       try {
         await updateDefaultModel.mutateAsync({
           workspaceId,
           providerId: entry.id,
-          body: {default_model: selectedModelForModelPayload(value.default_model)},
+          defaultModel: selectedModelForModelPayload(value.default_model),
         });
         onSaved();
       } catch (error) {

package/src/components/custom-model-provider-api-options.ts

@@ -1,12 +1,12 @@
-import type {ModelProviderApi} from '@shipfox/api-agent-dto';
+import type {ProviderApi} from '#core/models.js';
 
-export const MODEL_PROVIDER_API_OPTIONS: Array<{value: ModelProviderApi; label: string}> = [
+export const MODEL_PROVIDER_API_OPTIONS: Array<{value: ProviderApi; label: string}> = [
   {value: 'openai-completions', label: 'OpenAI Chat Completions'},
   {value: 'openai-responses', label: 'OpenAI Responses'},
   {value: 'anthropic-messages', label: 'Anthropic Messages'},
   {value: 'google-generative-ai', label: 'Google Generative AI'},
 ];
 
-export function modelProviderApiLabel(api: ModelProviderApi): string {
+export function modelProviderApiLabel(api: ProviderApi): string {
   return MODEL_PROVIDER_API_OPTIONS.find((option) => option.value === api)?.label ?? api;
 }

package/src/components/custom-model-provider-form.stories.tsx

@@ -1,9 +1,9 @@
-import type {CustomModelProviderConfigDto} from '@shipfox/api-agent-dto';
 import {configureApiClient} from '@shipfox/client-api';
 import {Modal, ModalContent, ModalHeader, ModalTitle} from '@shipfox/react-ui/modal';
 import type {Meta, StoryObj} from '@storybook/react';
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {useMemo, useState} from 'react';
+import type {CustomProviderConfig} from '#core/models.js';
 import {CustomModelProviderForm} from './custom-model-provider-form.js';
 
 interface CustomModelProviderFormStoryProps {
@@ -61,31 +61,31 @@ export const EditStoredSecrets: Story = {
   args: {mode: 'edit'},
 };
 
-function customConfig(): CustomModelProviderConfigDto {
+function customConfig(): CustomProviderConfig {
   return {
     kind: 'custom',
-    provider_id: 'local-vllm',
-    display_name: 'Local vLLM',
+    providerId: 'local-vllm',
+    displayName: 'Local vLLM',
     api: 'openai-completions',
-    base_url: 'http://localhost:8000/v1',
+    baseUrl: 'http://localhost:8000/v1',
     headers: [{name: 'x-region', value: 'us'}],
-    secret_header_names: ['authorization'],
+    secretHeaderNames: ['authorization'],
     models: [
       {
         id: 'llama-3.1',
         label: 'Llama 3.1',
-        context_window: 128000,
-        max_output_tokens: 16384,
+        contextWindow: 128000,
+        maxOutputTokens: 16384,
       },
       {
         id: 'qwen-coder',
         label: 'Qwen Coder',
-        context_window: 32768,
-        max_output_tokens: 8192,
+        contextWindow: 32768,
+        maxOutputTokens: 8192,
       },
     ],
-    default_model: 'llama-3.1',
-    created_at: '2026-05-08T00:00:00.000Z',
-    updated_at: '2026-05-08T00:00:00.000Z',
+    defaultModel: 'llama-3.1',
+    createdAt: '2026-05-08T00:00:00.000Z',
+    updatedAt: '2026-05-08T00:00:00.000Z',
   };
 }

package/src/components/custom-model-provider-form.tsx

@@ -1,4 +1,3 @@
-import type {CustomModelProviderConfigDto, ModelProviderApi} from '@shipfox/api-agent-dto';
 import {Badge} from '@shipfox/react-ui/badge';
 import {Button, IconButton} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
@@ -10,10 +9,12 @@ import {Text} from '@shipfox/react-ui/typography';
 import {useForm} from '@tanstack/react-form';
 import type {ReactNode, RefObject} from 'react';
 import {useEffect, useRef, useState} from 'react';
+import type {CustomProviderConfig, ProviderApi} from '#core/models.js';
 import {
   useCreateCustomModelProviderMutation,
   useDiscoverCustomModelProviderModelsBySlugMutation,
   useDiscoverCustomModelProviderModelsMutation,
+  useModelProviderCatalogQuery,
   useUpdateCustomModelProviderMutation,
 } from '#hooks/api/model-providers.js';
 import {MODEL_PROVIDER_API_OPTIONS} from './custom-model-provider-api-options.js';
@@ -44,12 +45,14 @@ export function CustomModelProviderForm({
   onSaved,
 }: {
   workspaceId: string;
-  existingConfig?: CustomModelProviderConfigDto | undefined;
+  existingConfig?: CustomProviderConfig | undefined;
   onSaved: () => void;
 }) {
   const createMutation = useCreateCustomModelProviderMutation();
   const updateMutation = useUpdateCustomModelProviderMutation();
   const discoverMutation = useDiscoverCustomModelProviderModelsMutation();
+  const catalogQuery = useModelProviderCatalogQuery();
+  const reservedProviderIds = catalogQuery.data?.providers.map((provider) => provider.id) ?? [];
   const discoverBySlugMutation = useDiscoverCustomModelProviderModelsBySlugMutation();
   const [slugEdited, setSlugEdited] = useState(existingConfig !== undefined);
   const [formError, setFormError] = useState<string | undefined>();
@@ -67,13 +70,13 @@ export function CustomModelProviderForm({
         if (existingConfig) {
           await updateMutation.mutateAsync({
             workspaceId,
-            providerId: existingConfig.provider_id,
-            body: buildUpdateCustomModelProviderBody(existingConfig, value),
+            providerId: existingConfig.providerId,
+            command: buildUpdateCustomModelProviderBody(existingConfig, value),
           });
         } else {
           await createMutation.mutateAsync({
             workspaceId,
-            body: buildCreateCustomModelProviderBody(value),
+            command: buildCreateCustomModelProviderBody(value),
           });
         }
         onSaved();
@@ -101,16 +104,16 @@ export function CustomModelProviderForm({
       const response = existingConfig
         ? await discoverBySlugMutation.mutateAsync({
             workspaceId,
-            providerId: existingConfig.provider_id,
-            body: buildDiscoverModelsBySlugBody(existingConfig, values),
+            providerId: existingConfig.providerId,
+            command: buildDiscoverModelsBySlugBody(existingConfig, values),
           })
         : await discoverMutation.mutateAsync({
             workspaceId,
-            body: buildDiscoverModelsBody(values),
+            command: buildDiscoverModelsBody(values),
           });
       if (!mountedRef.current) return;
       const existingIds = new Set(values.models.map((model) => model.id.trim()).filter(Boolean));
-      const discovered = response.models.filter((model) => !existingIds.has(model.id));
+      const discovered = response.filter((model) => !existingIds.has(model.id));
       form.setFieldValue('models', [
         ...values.models,
         ...discovered.map((model) => ({
@@ -200,9 +203,13 @@ export function CustomModelProviderForm({
                       name="slug"
                       validators={{
                         onBlur: ({value}) =>
-                          existingConfig ? undefined : customModelProviderSlugError(value),
+                          existingConfig
+                            ? undefined
+                            : customModelProviderSlugError(value, reservedProviderIds),
                         onSubmit: ({value}) =>
-                          existingConfig ? undefined : customModelProviderSlugError(value),
+                          existingConfig
+                            ? undefined
+                            : customModelProviderSlugError(value, reservedProviderIds),
                       }}
                     >
                       {(field) => (
@@ -234,7 +241,7 @@ export function CustomModelProviderForm({
                           <FormFieldSelect
                             value={field.state.value}
                             onChange={(event) =>
-                              field.handleChange(event.target.value as ModelProviderApi)
+                              field.handleChange(event.target.value as ProviderApi)
                             }
                             onBlur={field.handleBlur}
                           >

package/src/components/custom-model-provider-payload.test.ts

@@ -1,4 +1,4 @@
-import type {CustomModelProviderConfigDto} from '@shipfox/api-agent-dto';
+import type {CustomProviderConfig} from '#core/models.js';
 import {
   buildCreateCustomModelProviderBody,
   buildDiscoverModelsBody,
@@ -61,21 +61,21 @@ describe('custom model provider payload mappers', () => {
 
     expect(body).toEqual({
       slug: 'local-vllm',
-      display_name: 'Local vLLM',
+      displayName: 'Local vLLM',
       api: 'openai-completions',
-      base_url: 'http://localhost:8000/v1',
-      api_key: 'sk-local',
+      baseUrl: 'http://localhost:8000/v1',
+      apiKey: 'sk-local',
       headers: [{name: 'authorization', value: 'Bearer token', secret: true}],
       models: [
         {
           id: 'llama-3.1',
           label: 'Llama 3.1',
-          context_window: 128000,
-          max_output_tokens: 16384,
-          input_image: true,
+          contextWindow: 128000,
+          maxOutputTokens: 16384,
+          inputImage: true,
         },
       ],
-      default_model: 'llama-3.1',
+      defaultModel: 'llama-3.1',
     });
   });
 
@@ -131,11 +131,11 @@ describe('custom model provider payload mappers', () => {
 
     expect(body).toEqual({
       api: 'openai-responses',
-      base_url: 'https://llm.example.test/v1',
-      api_key: 'sk-new',
+      baseUrl: 'https://llm.example.test/v1',
+      apiKey: 'sk-new',
       headers: [
-        {name: 'x-region', value: 'us'},
-        {name: 'authorization', value: 'Bearer new'},
+        {name: 'x-region', value: 'us', secret: false},
+        {name: 'authorization', value: 'Bearer new', secret: false},
       ],
     });
   });
@@ -146,25 +146,25 @@ describe('custom model provider payload mappers', () => {
   });
 });
 
-function customConfig(): CustomModelProviderConfigDto {
+function customConfig(): CustomProviderConfig {
   return {
     kind: 'custom',
-    provider_id: 'local-vllm',
-    display_name: 'Local vLLM',
+    providerId: 'local-vllm',
+    displayName: 'Local vLLM',
     api: 'openai-responses',
-    base_url: 'https://llm.example.test/v1',
+    baseUrl: 'https://llm.example.test/v1',
     headers: [{name: 'x-region', value: 'us'}],
-    secret_header_names: ['authorization'],
+    secretHeaderNames: ['authorization'],
     models: [
       {
         id: 'llama-3.1',
         label: 'Llama 3.1',
-        context_window: 128000,
-        max_output_tokens: 16384,
+        contextWindow: 128000,
+        maxOutputTokens: 16384,
       },
     ],
-    default_model: 'llama-3.1',
-    created_at: '2026-05-08T00:00:00.000Z',
-    updated_at: '2026-05-08T00:00:00.000Z',
+    defaultModel: 'llama-3.1',
+    createdAt: '2026-05-08T00:00:00.000Z',
+    updatedAt: '2026-05-08T00:00:00.000Z',
   };
 }

package/src/components/custom-model-provider-payload.ts

@@ -1,15 +1,11 @@
 import type {
-  CreateCustomModelProviderBodyDto,
-  CustomAgentModelDto,
-  CustomModelProviderConfigDto,
-  DiscoverCustomModelProviderModelsBodyDto,
-  DiscoverCustomModelProviderModelsBySlugBodyDto,
-  ModelProviderApi,
-  UpdateCustomModelProviderBodyDto,
-} from '@shipfox/api-agent-dto';
-
-type CreateHeaderRequest = NonNullable<CreateCustomModelProviderBodyDto['headers']>[number];
-type UpdateHeaderRequest = NonNullable<UpdateCustomModelProviderBodyDto['headers']>[number];
+  AgentModel,
+  CreateCustomProviderCommand,
+  CustomProviderConfig,
+  DiscoverProviderModelsCommand,
+  ProviderApi,
+  UpdateCustomProviderCommand,
+} from '#core/models.js';
 
 export interface CustomModelProviderHeaderFormValue {
   client_id: string;
@@ -33,7 +29,7 @@ export interface CustomModelProviderModelFormValue {
 export interface CustomModelProviderFormValues {
   slug: string;
   display_name: string;
-  api: ModelProviderApi;
+  api: ProviderApi;
   base_url: string;
   api_key: string;
   headers: CustomModelProviderHeaderFormValue[];
@@ -65,13 +61,13 @@ export function createCustomModelProviderFormValues(): CustomModelProviderFormVa
 }
 
 export function editCustomModelProviderFormValues(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
 ): CustomModelProviderFormValues {
   return {
-    slug: config.provider_id,
-    display_name: config.display_name,
+    slug: config.providerId,
+    display_name: config.displayName,
     api: config.api,
-    base_url: config.base_url,
+    base_url: config.baseUrl,
     api_key: '',
     headers: [
       ...config.headers.map((header) => ({
@@ -82,7 +78,7 @@ export function editCustomModelProviderFormValues(
         hasStoredValue: false,
         storedName: header.name,
       })),
-      ...config.secret_header_names.map((name) => ({
+      ...config.secretHeaderNames.map((name) => ({
         client_id: createFormRowId(),
         name,
         value: '',
@@ -92,45 +88,45 @@ export function editCustomModelProviderFormValues(
       })),
     ],
     models: config.models.map(modelFormValue),
-    default_model: config.default_model ?? '',
+    default_model: config.defaultModel ?? '',
   };
 }
 
 export function buildCreateCustomModelProviderBody(
   values: CustomModelProviderFormValues,
-): CreateCustomModelProviderBodyDto {
+): CreateCustomProviderCommand {
   return {
     slug: values.slug.trim(),
-    display_name: values.display_name.trim(),
+    displayName: values.display_name.trim(),
     api: values.api,
-    base_url: values.base_url.trim(),
-    ...(values.api_key.trim() ? {api_key: values.api_key.trim()} : {}),
+    baseUrl: values.base_url.trim(),
+    ...(values.api_key.trim() ? {apiKey: values.api_key.trim()} : {}),
     ...(requestHeaders(values.headers).length > 0 ? {headers: requestHeaders(values.headers)} : {}),
     models: requestModels(values.models),
-    ...(values.default_model.trim() ? {default_model: values.default_model.trim()} : {}),
+    ...(values.default_model.trim() ? {defaultModel: values.default_model.trim()} : {}),
   };
 }
 
 export function buildUpdateCustomModelProviderBody(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
   values: CustomModelProviderFormValues,
-): UpdateCustomModelProviderBodyDto {
-  const body: UpdateCustomModelProviderBodyDto = {};
-  if (values.display_name.trim() !== config.display_name)
-    body.display_name = values.display_name.trim();
+): UpdateCustomProviderCommand {
+  const body: UpdateCustomProviderCommand = {};
+  if (values.display_name.trim() !== config.displayName)
+    body.displayName = values.display_name.trim();
   if (values.api !== config.api) body.api = values.api;
-  if (values.base_url.trim() !== config.base_url) body.base_url = values.base_url.trim();
-  if (values.api_key.trim()) body.api_key = values.api_key.trim();
+  if (values.base_url.trim() !== config.baseUrl) body.baseUrl = values.base_url.trim();
+  if (values.api_key.trim()) body.apiKey = values.api_key.trim();
   if (customHeadersDirty(config, values.headers)) body.headers = updateHeaders(values.headers);
   if (customModelsDirty(config, values.models)) body.models = requestModels(values.models);
 
   const nextDefault = values.default_model.trim() || null;
-  if (nextDefault !== config.default_model) body.default_model = nextDefault;
+  if (nextDefault !== config.defaultModel) body.defaultModel = nextDefault;
   return body;
 }
 
 export function customHeadersDirty(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
   headers: CustomModelProviderHeaderFormValue[],
 ): boolean {
   return (
@@ -141,7 +137,7 @@ export function customHeadersDirty(
         value: header.value,
         secret: false,
       })),
-      ...config.secret_header_names.map((name) => ({
+      ...config.secretHeaderNames.map((name) => ({
         name: normalizeHeaderName(name),
         secret: true,
         keep: true,
@@ -151,24 +147,37 @@ export function customHeadersDirty(
 }
 
 export function customModelsDirty(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
   models: CustomModelProviderModelFormValue[],
 ): boolean {
-  return JSON.stringify(requestModels(models)) !== JSON.stringify(config.models);
+  return (
+    JSON.stringify(requestModels(models)) !==
+    JSON.stringify(
+      config.models.map((model) => ({
+        id: model.id,
+        label: model.label,
+        ...(model.contextWindow === undefined ? {} : {contextWindow: model.contextWindow}),
+        ...(model.maxOutputTokens === undefined ? {} : {maxOutputTokens: model.maxOutputTokens}),
+        ...(model.inputImage ? {inputImage: true} : {}),
+        ...(model.reasoning ? {reasoning: true} : {}),
+      })),
+    )
+  );
 }
 
 export function buildDiscoverModelsBody(
   values: CustomModelProviderFormValues,
-): DiscoverCustomModelProviderModelsBodyDto {
+): DiscoverProviderModelsCommand {
   return {
     api: values.api,
-    base_url: values.base_url.trim(),
-    ...(values.api_key.trim() ? {api_key: values.api_key.trim()} : {}),
+    baseUrl: values.base_url.trim(),
+    ...(values.api_key.trim() ? {apiKey: values.api_key.trim()} : {}),
     ...(requestHeaders(values.headers).length > 0
       ? {
           headers: requestHeaders(values.headers).map(({name, value}) => ({
             name,
             value,
+            secret: false,
           })),
         }
       : {}),
@@ -176,13 +185,13 @@ export function buildDiscoverModelsBody(
 }
 
 export function buildDiscoverModelsBySlugBody(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
   values: CustomModelProviderFormValues,
-): DiscoverCustomModelProviderModelsBySlugBodyDto {
-  const body: DiscoverCustomModelProviderModelsBySlugBodyDto = {};
+): DiscoverProviderModelsCommand {
+  const body: DiscoverProviderModelsCommand = {};
   if (values.api !== config.api) body.api = values.api;
-  if (values.base_url.trim() !== config.base_url) body.base_url = values.base_url.trim();
-  if (values.api_key.trim()) body.api_key = values.api_key.trim();
+  if (values.base_url.trim() !== config.baseUrl) body.baseUrl = values.base_url.trim();
+  if (values.api_key.trim()) body.apiKey = values.api_key.trim();
   body.headers = updateHeaders(values.headers);
   return body;
 }
@@ -200,8 +209,10 @@ export function createFormRowId(): string {
   return crypto.randomUUID();
 }
 
-function updateHeaders(headers: CustomModelProviderHeaderFormValue[]): UpdateHeaderRequest[] {
-  const result: UpdateHeaderRequest[] = [];
+function updateHeaders(
+  headers: CustomModelProviderHeaderFormValue[],
+): NonNullable<UpdateCustomProviderCommand['headers']> {
+  const result: NonNullable<UpdateCustomProviderCommand['headers']> = [];
   for (const header of headers) {
     const name = normalizeHeaderName(header.name);
     if (!name) continue;
@@ -219,7 +230,9 @@ function updateHeaders(headers: CustomModelProviderHeaderFormValue[]): UpdateHea
   return result;
 }
 
-function requestHeaders(headers: CustomModelProviderHeaderFormValue[]): CreateHeaderRequest[] {
+function requestHeaders(
+  headers: CustomModelProviderHeaderFormValue[],
+): NonNullable<CreateCustomProviderCommand['headers']> {
   return updateHeaders(headers).flatMap((header) =>
     'value' in header && header.value
       ? [{name: header.name, value: header.value, secret: header.secret}]
@@ -227,7 +240,9 @@ function requestHeaders(headers: CustomModelProviderHeaderFormValue[]): CreateHe
   );
 }
 
-function requestModels(models: CustomModelProviderModelFormValue[]): CustomAgentModelDto[] {
+function requestModels(
+  models: CustomModelProviderModelFormValue[],
+): CreateCustomProviderCommand['models'] {
   return models.flatMap((model) => {
     const id = model.id.trim();
     const label = model.label.trim();
@@ -236,25 +251,25 @@ function requestModels(models: CustomModelProviderModelFormValue[]): CustomAgent
       {
         id,
         label,
-        ...(model.context_window.trim() ? {context_window: Number(model.context_window)} : {}),
+        ...(model.context_window.trim() ? {contextWindow: Number(model.context_window)} : {}),
         ...(model.max_output_tokens.trim()
-          ? {max_output_tokens: Number(model.max_output_tokens)}
+          ? {maxOutputTokens: Number(model.max_output_tokens)}
           : {}),
-        ...(model.input_image ? {input_image: true} : {}),
+        ...(model.input_image ? {inputImage: true} : {}),
         ...(model.reasoning ? {reasoning: true} : {}),
       },
     ];
   });
 }
 
-function modelFormValue(model: CustomAgentModelDto): CustomModelProviderModelFormValue {
+function modelFormValue(model: AgentModel): CustomModelProviderModelFormValue {
   return {
     client_id: createFormRowId(),
     id: model.id,
     label: model.label,
-    context_window: model.context_window?.toString() ?? '',
-    max_output_tokens: model.max_output_tokens?.toString() ?? '',
-    input_image: model.input_image ?? false,
+    context_window: model.contextWindow?.toString() ?? '',
+    max_output_tokens: model.maxOutputTokens?.toString() ?? '',
+    input_image: model.inputImage ?? false,
     reasoning: model.reasoning ?? false,
   };
 }

package/src/components/custom-model-provider-slug.test.ts

@@ -25,7 +25,7 @@ describe('customModelProviderSlugError', () => {
   });
 
   test('rejects reserved built-in provider ids', () => {
-    const result = customModelProviderSlugError('anthropic');
+    const result = customModelProviderSlugError('anthropic', ['anthropic']);
 
     expect(result).toBe('This id is reserved for a built-in provider.');
   });