@shipfox/client-agent 5.0.0 → 6.0.2

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

@@ -1,4 +1,4 @@
-import {isReservedModelProviderId, MODEL_PROVIDER_SLUG_PATTERN} from '@shipfox/api-agent-dto';
+import {MODEL_PROVIDER_SLUG_PATTERN} from '@shipfox/api-agent-dto';
 
 const MAX_SLUG_LENGTH = 40;
 const SLUG_FORMAT_ERROR =
@@ -15,9 +15,12 @@ export function deriveCustomModelProviderSlug(displayName: string): string {
     .replace(/-+$/g, '');
 }
 
-export function customModelProviderSlugError(slug: string): string | undefined {
+export function customModelProviderSlugError(
+  slug: string,
+  reservedProviderIds: readonly string[] = [],
+): string | undefined {
   const trimmed = slug.trim();
   if (!MODEL_PROVIDER_SLUG_PATTERN.test(trimmed)) return SLUG_FORMAT_ERROR;
-  if (isReservedModelProviderId(trimmed)) return 'This id is reserved for a built-in provider.';
+  if (reservedProviderIds.includes(trimmed)) return 'This id is reserved for a built-in provider.';
   return undefined;
 }

package/src/components/default-model-field.tsx

@@ -1,7 +1,7 @@
-import type {ModelProviderCatalogEntryDto} from '@shipfox/api-agent-dto';
 import {FormField, useFormField} from '@shipfox/react-ui/form-field';
 import {cn} from '@shipfox/react-ui/utils';
 import type {ComponentProps, ReactNode} from 'react';
+import type {SupportedProvider} from '#core/models.js';
 
 export const LATEST_MODEL_VALUE = '__latest__';
 
@@ -13,7 +13,7 @@ export function DefaultModelField({
   onChange,
   onBlur,
 }: {
-  entry: ModelProviderCatalogEntryDto;
+  entry: SupportedProvider;
   value: string;
   error: string | undefined;
   children?: ReactNode;
@@ -52,13 +52,13 @@ export function selectedModelForModelPayload(selectedModel: string): string | nu
   return selectedModel === LATEST_MODEL_VALUE ? null : selectedModel.trim();
 }
 
-function defaultModelLabel(entry: ModelProviderCatalogEntryDto): string {
-  const defaultModel = entry.default_model ?? entry.models[0]?.id ?? '';
+function defaultModelLabel(entry: SupportedProvider): string {
+  const defaultModel = entry.defaultModel ?? entry.models[0]?.id ?? '';
   return entry.models.find((model) => model.id === defaultModel)?.label ?? defaultModel;
 }
 
 function defaultModelDescription(
-  entry: ModelProviderCatalogEntryDto,
+  entry: SupportedProvider,
   selectedModel: string | undefined,
 ): string | undefined {
   if (selectedModel === LATEST_MODEL_VALUE) {

package/src/components/harness-availability.test.ts

@@ -1,28 +1,31 @@
-import {getHarnessDescriptor} from '@shipfox/api-agent-dto';
+import {getHarness} from '#core/harness-policy.js';
+import {toProviderConfig} from '#hooks/api/model-provider-mapper.js';
 import {customModelProviderConfig, modelProviderConfig} from '#test/fixtures/model-providers.js';
 import {compatibleHarnessIds, isHarnessAvailable} from './harness-availability.js';
 
 describe('harness availability', () => {
   test('marks pi available with any builtin provider config', () => {
-    const result = isHarnessAvailable(getHarnessDescriptor('pi'), [
-      modelProviderConfig({provider_id: 'openai'}),
+    const result = isHarnessAvailable(getHarness('pi'), [
+      toProviderConfig(modelProviderConfig({provider_id: 'openai'})),
     ]);
 
     expect(result).toBe(true);
   });
 
   test('marks pi available with only a custom provider config', () => {
-    const result = isHarnessAvailable(getHarnessDescriptor('pi'), [customModelProviderConfig()]);
+    const result = isHarnessAvailable(getHarness('pi'), [
+      toProviderConfig(customModelProviderConfig()),
+    ]);
 
     expect(result).toBe(true);
   });
 
   test('marks claude available only when Anthropic is configured', () => {
-    const openai = isHarnessAvailable(getHarnessDescriptor('claude'), [
-      modelProviderConfig({provider_id: 'openai'}),
+    const openai = isHarnessAvailable(getHarness('claude'), [
+      toProviderConfig(modelProviderConfig({provider_id: 'openai'})),
     ]);
-    const anthropic = isHarnessAvailable(getHarnessDescriptor('claude'), [
-      modelProviderConfig({provider_id: 'anthropic'}),
+    const anthropic = isHarnessAvailable(getHarness('claude'), [
+      toProviderConfig(modelProviderConfig({provider_id: 'anthropic'})),
     ]);
 
     expect(openai).toBe(false);
@@ -30,8 +33,8 @@ describe('harness availability', () => {
   });
 
   test('marks both harnesses unavailable when no providers are configured', () => {
-    expect(isHarnessAvailable(getHarnessDescriptor('pi'), [])).toBe(false);
-    expect(isHarnessAvailable(getHarnessDescriptor('claude'), [])).toBe(false);
+    expect(isHarnessAvailable(getHarness('pi'), [])).toBe(false);
+    expect(isHarnessAvailable(getHarness('claude'), [])).toBe(false);
   });
 
   test('returns compatible harnesses for builtin and custom providers', () => {

package/src/components/harness-availability.ts

@@ -1,35 +1,11 @@
-import {
-  DEFAULT_HARNESS,
-  type Harness,
-  type HarnessDescriptor,
-  listHarnessDescriptors,
-  type ModelProviderConfigResponseDto,
-} from '@shipfox/api-agent-dto';
-
-export function configSupportsHarness(
-  config: ModelProviderConfigResponseDto,
-  descriptor: HarnessDescriptor,
-): boolean {
-  if (config.kind === 'custom') return descriptor.id === DEFAULT_HARNESS;
-  return descriptor.supportedProviderIds.includes(config.provider_id);
-}
+import {compatibleHarnessIds, configSupportsHarness} from '#core/harness-policy.js';
+import type {HarnessDescriptor, ProviderConfig} from '#core/models.js';
 
 export function isHarnessAvailable(
   descriptor: HarnessDescriptor,
-  configs: ModelProviderConfigResponseDto[],
+  configs: readonly ProviderConfig[],
 ): boolean {
   return configs.some((config) => configSupportsHarness(config, descriptor));
 }
 
-export function compatibleHarnessIds({
-  isCustom,
-  providerId,
-}: {
-  isCustom: boolean;
-  providerId: string;
-}): Harness[] {
-  if (isCustom) return [DEFAULT_HARNESS];
-  return listHarnessDescriptors()
-    .filter((descriptor) => descriptor.supportedProviderIds.includes(providerId))
-    .map((descriptor) => descriptor.id);
-}
+export {compatibleHarnessIds};

package/src/components/harnesses-section.tsx

@@ -1,9 +1,3 @@
-import {
-  DEFAULT_HARNESS,
-  type Harness,
-  type HarnessDescriptor,
-  listHarnessDescriptors,
-} from '@shipfox/api-agent-dto';
 import {QueryLoadError} from '@shipfox/client-ui';
 import {IconButton} from '@shipfox/react-ui/button';
 import {Callout} from '@shipfox/react-ui/callout';
@@ -20,6 +14,8 @@ import {Tooltip, TooltipContent, TooltipTrigger} from '@shipfox/react-ui/tooltip
 import {Header, Text} from '@shipfox/react-ui/typography';
 import {cn} from '@shipfox/react-ui/utils';
 import {useRef, useState} from 'react';
+import {DEFAULT_HARNESS, listHarnesses} from '#core/harness-policy.js';
+import type {HarnessDescriptor, HarnessId} from '#core/models.js';
 import {
   useModelProviderConfigsQuery,
   useSetDefaultHarnessMutation,
@@ -38,13 +34,13 @@ export function WorkspaceHarnessesSection({workspaceId}: {workspaceId: string})
   const activeDefaultRequestRef = useRef<{workspaceId: string; id: number} | null>(null);
   const [pendingDefaultHarness, setPendingDefaultHarness] = useState<{
     workspaceId: string;
-    harnessId: Harness;
+    harnessId: HarnessId;
   } | null>(null);
   const [defaultError, setDefaultError] = useState<
-    {workspaceId: string; harnessId: Harness; message: string} | undefined
+    {workspaceId: string; harnessId: HarnessId; message: string} | undefined
   >();
   const configs = configsQuery.data?.configs ?? [];
-  const defaultHarnessId = configsQuery.data?.default_harness_id ?? DEFAULT_HARNESS;
+  const defaultHarnessId = configsQuery.data?.defaultHarnessId ?? DEFAULT_HARNESS;
   activeWorkspaceIdRef.current = workspaceId;
 
   function isActiveDefaultRequest(request: {workspaceId: string; id: number}) {
@@ -67,7 +63,7 @@ export function WorkspaceHarnessesSection({workspaceId}: {workspaceId: string})
     try {
       await setDefaultHarness.mutateAsync({
         workspaceId,
-        body: {harness_id: harness.id},
+        harnessId: harness.id,
       });
       if (!isActiveDefaultRequest(request)) return;
       toast.success(`${harness.label} is now the default harness`);
@@ -106,7 +102,7 @@ export function WorkspaceHarnessesSection({workspaceId}: {workspaceId: string})
 
       {configsQuery.data !== undefined ? (
         <ul className={cn('divide-y divide-border-neutral-base', SURFACE_CLASS)}>
-          {listHarnessDescriptors().map((harness) => (
+          {listHarnesses().map((harness) => (
             <HarnessRow
               key={harness.id}
               harness={harness}

package/src/components/model-provider-usage-modal.stories.tsx

@@ -1,9 +1,6 @@
-import type {
-  CustomModelProviderConfigDto,
-  ModelProviderCatalogEntryDto,
-} from '@shipfox/api-agent-dto';
 import type {Meta, StoryObj} from '@storybook/react';
 import {useState} from 'react';
+import type {CustomProviderConfig, SupportedProvider} from '#core/models.js';
 import {ModelProviderUsageModal} from './model-provider-usage-modal.js';
 import {
   usageTargetFromCatalogEntry,
@@ -26,7 +23,7 @@ function ModelProviderUsageModalStory({variant}: ModelProviderUsageModalStoryPro
     <div className="min-h-screen bg-background-neutral-background p-24">
       <ModelProviderUsageModal
         target={target}
-        initialModel={target.default_model}
+        initialModel={target.defaultModel}
         workspaceDefaultHarnessId="claude"
         open={open}
         onOpenChange={setOpen}
@@ -55,14 +52,13 @@ export const CustomProvider: Story = {
   args: {variant: 'custom'},
 };
 
-function anthropicEntry(): ModelProviderCatalogEntryDto {
+function anthropicEntry(): SupportedProvider {
   return {
+    kind: 'supported',
     id: 'anthropic',
     label: 'Anthropic',
-    support_status: 'supported',
-    default_model: 'claude-opus-4-8',
-    credential_fields: [{key: 'api_key', label: 'API key', secret: true}],
-    unsupported_reason: null,
+    defaultModel: 'claude-opus-4-8',
+    credentialFields: [{key: 'api_key', label: 'API key', secret: true}],
     models: [
       {id: 'claude-opus-4-8', label: 'Claude Opus 4.8'},
       {id: 'claude-sonnet-4-8', label: 'Claude Sonnet 4.8'},
@@ -71,14 +67,13 @@ function anthropicEntry(): ModelProviderCatalogEntryDto {
   };
 }
 
-function longListEntry(): ModelProviderCatalogEntryDto {
+function longListEntry(): SupportedProvider {
   return {
+    kind: 'supported',
     id: 'cloudflare-workers-ai',
     label: 'Cloudflare Workers AI',
-    support_status: 'supported',
-    default_model: '@cf/moonshotai/kimi-k2.7-code',
-    credential_fields: [{key: 'api_token', label: 'API token', secret: true}],
-    unsupported_reason: null,
+    defaultModel: '@cf/moonshotai/kimi-k2.7-code',
+    credentialFields: [{key: 'api_token', label: 'API token', secret: true}],
     models: Array.from({length: 56}, (_, index) => ({
       id:
         index === 0
@@ -89,18 +84,18 @@ function longListEntry(): ModelProviderCatalogEntryDto {
   };
 }
 
-function customProviderConfig(): CustomModelProviderConfigDto {
+function customProviderConfig(): 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: [],
-    secret_header_names: [],
+    secretHeaderNames: [],
     models: [{id: 'llama-3.1', label: 'Llama 3.1'}],
-    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/model-provider-usage-modal.test.tsx

@@ -1,6 +1,6 @@
 import {fireEvent, render, screen, waitFor, within} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import {customModelProviderConfig, modelProviderEntry} from '#test/fixtures/model-providers.js';
+import type {CustomProviderConfig, SupportedProvider} from '#core/models.js';
 import {ModelProviderUsageModal} from './model-provider-usage-modal.js';
 import {
   usageTargetFromCatalogEntry,
@@ -12,8 +12,8 @@ const KIMI_MODEL_ROW_NAME = 'Copy Kimi K2.7 Code model id @cf/moonshotai/kimi-k2
 
 function renderUsageModal() {
   const onOpenChange = vi.fn();
-  const entry = modelProviderEntry({
-    default_model: 'claude-opus-4-8',
+  const entry = supportedProvider({
+    defaultModel: 'claude-opus-4-8',
     models: [
       {id: 'claude-opus-4-8', label: 'Claude Opus 4.8'},
       {id: '@cf/moonshotai/kimi-k2.7-code', label: 'Kimi K2.7 Code'},
@@ -79,7 +79,7 @@ describe('ModelProviderUsageModal', () => {
 
   test('uses the workspace default harness when it is compatible', async () => {
     const onOpenChange = vi.fn();
-    const entry = modelProviderEntry();
+    const entry = supportedProvider();
 
     render(
       <ModelProviderUsageModal
@@ -100,8 +100,8 @@ describe('ModelProviderUsageModal', () => {
 
   test('clamps the selected harness when the target changes', async () => {
     const onOpenChange = vi.fn();
-    const anthropic = modelProviderEntry();
-    const openai = modelProviderEntry({
+    const anthropic = supportedProvider();
+    const openai = supportedProvider({
       id: 'openai',
       label: 'OpenAI',
       models: [{id: 'gpt-5.5-pro', label: 'GPT-5.5 Pro'}],
@@ -144,7 +144,7 @@ describe('ModelProviderUsageModal', () => {
 
     render(
       <ModelProviderUsageModal
-        target={usageTargetFromCustomConfig(customModelProviderConfig())}
+        target={usageTargetFromCustomConfig(customProviderConfig())}
         initialModel="custom-model"
         workspaceDefaultHarnessId="claude"
         open
@@ -208,3 +208,31 @@ describe('ModelProviderUsageModal', () => {
     );
   });
 });
+
+function supportedProvider(overrides: Partial<SupportedProvider> = {}): SupportedProvider {
+  return {
+    kind: 'supported',
+    id: 'anthropic',
+    label: 'Anthropic',
+    defaultModel: 'claude-opus-4-8',
+    credentialFields: [{key: 'api_key', label: 'API key', secret: true}],
+    models: [{id: 'claude-opus-4-8', label: 'Claude Opus 4.8'}],
+    ...overrides,
+  };
+}
+
+function customProviderConfig(): CustomProviderConfig {
+  return {
+    kind: 'custom',
+    providerId: 'openai-compatible',
+    displayName: 'OpenAI Compatible',
+    api: 'openai-completions',
+    baseUrl: 'https://llm.example.test/v1',
+    headers: [],
+    secretHeaderNames: [],
+    models: [{id: 'custom-model', label: 'Custom Model'}],
+    defaultModel: 'custom-model',
+    createdAt: '2026-05-08T00:00:00.000Z',
+    updatedAt: '2026-05-08T00:00:00.000Z',
+  };
+}

package/src/components/model-provider-usage-modal.tsx

@@ -1,9 +1,3 @@
-import {
-  DEFAULT_HARNESS,
-  getHarnessDescriptor,
-  type Harness,
-  listHarnessDescriptors,
-} from '@shipfox/api-agent-dto';
 import {Button} from '@shipfox/react-ui/button';
 import {
   CodeBlock,
@@ -28,6 +22,8 @@ import {
 import {Tooltip, TooltipContent, TooltipTrigger} from '@shipfox/react-ui/tooltip';
 import {Code, Text} from '@shipfox/react-ui/typography';
 import {useEffect, useMemo, useRef, useState} from 'react';
+import {DEFAULT_HARNESS, getHarness, listHarnesses} from '#core/harness-policy.js';
+import type {HarnessId} from '#core/models.js';
 import {buildAgentWorkflowExample} from './agent-workflow-example.js';
 import {compatibleHarnessIds} from './harness-availability.js';
 import type {ModelProviderUsageTarget} from './model-provider-usage-target.js';
@@ -49,14 +45,14 @@ export function ModelProviderUsageModal({
   open: boolean;
   onOpenChange: (open: boolean) => void;
   closeFocusTarget?: HTMLElement | null | undefined;
-  workspaceDefaultHarnessId?: Harness | null | undefined;
+  workspaceDefaultHarnessId?: HarnessId | null | undefined;
 }) {
   const [selectedModel, setSelectedModel] = useState('');
-  const [selectedHarness, setSelectedHarness] = useState<Harness>(DEFAULT_HARNESS);
+  const [selectedHarness, setSelectedHarness] = useState<HarnessId>(DEFAULT_HARNESS);
 
   useEffect(() => {
     if (!target) return;
-    setSelectedModel(initialModel ?? target.default_model ?? target.models[0]?.id ?? '');
+    setSelectedModel(initialModel ?? target.defaultModel ?? target.models[0]?.id ?? '');
   }, [target, initialModel]);
 
   useEffect(() => {
@@ -72,14 +68,14 @@ export function ModelProviderUsageModal({
     () =>
       target
         ? compatibleHarnessIds({isCustom: target.isCustom, providerId: target.id})
-        : ([] as Harness[]),
+        : ([] as HarnessId[]),
     [target],
   );
   const harnessOptions = useMemo(
     () =>
       compatibleIds.map((harnessId) => ({
         value: harnessId,
-        label: getHarnessDescriptor(harnessId).label,
+        label: getHarness(harnessId).label,
       })),
     [compatibleIds],
   );
@@ -239,9 +235,9 @@ export function ModelProviderUsageModal({
 }
 
 function selectInitialHarness(
-  compatibleIds: Harness[],
-  workspaceDefaultHarnessId: Harness | null | undefined,
-): Harness {
+  compatibleIds: HarnessId[],
+  workspaceDefaultHarnessId: HarnessId | null | undefined,
+): HarnessId {
   if (workspaceDefaultHarnessId && compatibleIds.includes(workspaceDefaultHarnessId)) {
     return workspaceDefaultHarnessId;
   }
@@ -249,8 +245,8 @@ function selectInitialHarness(
   return compatibleIds[0] ?? DEFAULT_HARNESS;
 }
 
-function isHarness(value: string): value is Harness {
-  return listHarnessDescriptors().some((descriptor) => descriptor.id === value);
+function isHarness(value: string): value is HarnessId {
+  return listHarnesses().some((descriptor) => descriptor.id === value);
 }
 
 function ModelProviderModelRow({label, id}: {label: string; id: string}) {

package/src/components/model-provider-usage-target.ts

@@ -1,36 +1,33 @@
-import type {
-  CustomModelProviderConfigDto,
-  ModelProviderCatalogEntryDto,
-} from '@shipfox/api-agent-dto';
+import type {CustomProviderConfig, SupportedProvider} from '#core/models.js';
 
 export interface ModelProviderUsageTarget {
   id: string;
   label: string;
   isCustom: boolean;
-  models: Array<{id: string; label: string}>;
-  default_model: string | null;
+  models: ReadonlyArray<{id: string; label: string}>;
+  defaultModel: string | null;
 }
 
-export function usageTargetFromCatalogEntry(
-  entry: ModelProviderCatalogEntryDto,
-): ModelProviderUsageTarget {
+export function usageTargetFromCatalogEntry(entry: SupportedProvider): ModelProviderUsageTarget {
+  const provider = entry;
   return {
-    id: entry.id,
-    label: entry.label,
+    id: provider.id,
+    label: provider.label,
     isCustom: false,
-    models: entry.models,
-    default_model: entry.default_model,
+    models: provider.models,
+    defaultModel: provider.defaultModel,
   };
 }
 
 export function usageTargetFromCustomConfig(
-  config: CustomModelProviderConfigDto,
+  config: CustomProviderConfig,
 ): ModelProviderUsageTarget {
+  const provider = config;
   return {
-    id: config.provider_id,
-    label: config.display_name,
+    id: provider.providerId,
+    label: provider.displayName,
     isCustom: true,
-    models: config.models,
-    default_model: config.default_model,
+    models: provider.models,
+    defaultModel: provider.defaultModel,
   };
 }

package/src/components/model-providers-section.stories.tsx

@@ -255,7 +255,7 @@ function catalogForScenario(scenario: Scenario): ModelProviderCatalogEntryDto[]
 
 function configsForScenario(scenario: Scenario) {
   if (scenario === 'empty-configured' || scenario === 'configs-error') {
-    return {configs: [], default_provider_id: null};
+    return {configs: [], default_provider_id: null, default_harness_id: null};
   }
   if (scenario === 'all-configured') {
     return {
@@ -265,17 +265,20 @@ function configsForScenario(scenario: Scenario) {
         }),
       ),
       default_provider_id: 'anthropic',
+      default_harness_id: null,
     };
   }
   if (scenario === 'custom-configured') {
     return {
       configs: [providerConfig({provider_id: 'anthropic'}), customProviderConfig()],
       default_provider_id: 'local-vllm',
+      default_harness_id: null,
     };
   }
   return {
     configs: [providerConfig({provider_id: 'anthropic'})],
     default_provider_id: 'anthropic',
+    default_harness_id: null,
   };
 }