@vibe-forge/client 0.9.0 → 0.10.1

package/src/hooks/chat/model-selector-data-builders.ts

@@ -0,0 +1,146 @@
+import type {
+  AdapterBuiltinModel,
+  ModelMetadataConfig,
+  ModelServiceConfig,
+  RecommendedModelConfig
+} from '@vibe-forge/types'
+
+import type { ServiceModelEntry } from './model-selector'
+import {
+  buildServiceModelSelector,
+  resolveModelDisplayMetadata,
+  resolveModelServiceTitle,
+  resolveServiceModelSelector
+} from './model-selector'
+import { buildModelSelectOption } from './model-selector-data-option-utils'
+
+export const buildServiceModelGroups = (params: {
+  mergedModelServices: Record<string, ModelServiceConfig>
+  mergedModels: Record<string, ModelMetadataConfig>
+}) => {
+  return Object.entries(params.mergedModelServices)
+    .map(([serviceKey, serviceValue]) => {
+      const service = (serviceValue != null && typeof serviceValue === 'object')
+        ? serviceValue
+        : undefined
+      const serviceTitle = resolveModelServiceTitle({
+        serviceKey,
+        service
+      })
+      const title = serviceTitle?.trim() !== '' ? serviceTitle : serviceKey
+      const models = Array.isArray(service?.models)
+        ? service.models.filter((item: unknown): item is string => typeof item === 'string')
+        : []
+
+      if (models.length === 0) return null
+
+      return {
+        key: `service:${serviceKey}`,
+        title,
+        description: service?.description?.trim() || undefined,
+        options: models.map((model) => {
+          const value = buildServiceModelSelector(serviceKey, model)
+          const metadata = resolveModelDisplayMetadata({
+            model: value,
+            models: params.mergedModels
+          })
+
+          return buildModelSelectOption({
+            value,
+            title: metadata?.title ?? metadata?.aliases[0] ?? model,
+            modelName: model,
+            description: metadata?.description,
+            aliases: metadata?.aliases,
+            serviceKey,
+            serviceTitle,
+            searchTerms: [model, ...(metadata?.aliases ?? []), metadata?.title]
+          })
+        })
+      }
+    })
+    .filter((group): group is NonNullable<typeof group> => group != null)
+}
+
+export const buildBuiltinModelGroups = (params: {
+  activeBuiltinModels: Record<string, AdapterBuiltinModel[]>
+  builtinGroupTitle: (adapterKey: string) => string
+  mergedModels: Record<string, ModelMetadataConfig>
+}) => {
+  return Object.entries(params.activeBuiltinModels)
+    .map(([adapterKey, models]) => {
+      if (!Array.isArray(models) || models.length === 0) return null
+
+      return {
+        key: `builtin:${adapterKey}`,
+        title: params.builtinGroupTitle(adapterKey),
+        options: models.map((model) => {
+          const metadata = resolveModelDisplayMetadata({
+            model: model.value,
+            models: params.mergedModels
+          })
+
+          return buildModelSelectOption({
+            value: model.value,
+            title: metadata?.title ?? metadata?.aliases[0] ?? model.title,
+            modelName: model.value,
+            description: metadata?.description ?? model.description,
+            aliases: metadata?.aliases,
+            searchTerms: [model.value, ...(metadata?.aliases ?? []), metadata?.title]
+          })
+        })
+      }
+    })
+    .filter((group): group is NonNullable<typeof group> => group != null)
+}
+
+export const buildRecommendedModelOptions = (params: {
+  availableServiceModels: ServiceModelEntry[]
+  defaultModelService?: string
+  mergedModels: Record<string, ModelMetadataConfig>
+  mergedModelServices: Record<string, ModelServiceConfig>
+  recommendedModels: RecommendedModelConfig[]
+  modelToService: Map<string, { key: string; title: string }>
+}) => {
+  return params.recommendedModels
+    .filter((item) => {
+      if (item.placement && item.placement !== 'modelSelector') return false
+
+      return resolveServiceModelSelector({
+        value: item.service ? buildServiceModelSelector(item.service, item.model) : item.model,
+        serviceModels: params.availableServiceModels,
+        preferredServiceKey: item.service ?? params.defaultModelService
+      }) != null
+    })
+    .map((item) => {
+      const serviceInfo = item.service ? params.mergedModelServices[item.service] : undefined
+      const serviceTitle = item.service
+        ? resolveModelServiceTitle({
+          serviceKey: item.service,
+          service: serviceInfo
+        })
+        : params.modelToService.get(item.model)?.title
+      const resolvedModel = item.service ? buildServiceModelSelector(item.service, item.model) : item.model
+      const metadata = resolveModelDisplayMetadata({
+        model: resolvedModel,
+        models: params.mergedModels
+      })
+      const recommendedTitle = item.title?.trim()
+      const recommendedDescription = item.description?.trim()
+      const value = resolveServiceModelSelector({
+        value: resolvedModel,
+        serviceModels: params.availableServiceModels,
+        preferredServiceKey: item.service ?? params.defaultModelService
+      }) ?? item.model
+
+      return buildModelSelectOption({
+        value,
+        title: recommendedTitle || metadata?.title || metadata?.aliases[0] || item.model,
+        modelName: item.model,
+        description: recommendedDescription || metadata?.description,
+        aliases: metadata?.aliases,
+        serviceKey: item.service ?? params.modelToService.get(item.model)?.key,
+        serviceTitle,
+        searchTerms: [item.model, ...(metadata?.aliases ?? []), metadata?.title]
+      })
+    })
+}

package/src/hooks/chat/model-selector-data-option-utils.ts

@@ -0,0 +1,62 @@
+import type { ModelSelectOptionData } from './model-selector-data-types'
+
+export const sortOptionsByDisplayLabel = (options: ModelSelectOptionData[]) => {
+  return [...options].sort((left, right) => {
+    const labelComparison = left.displayLabel.localeCompare(right.displayLabel, undefined, {
+      sensitivity: 'base'
+    })
+    if (labelComparison !== 0) return labelComparison
+
+    const modelComparison = left.modelName.localeCompare(right.modelName, undefined, {
+      sensitivity: 'base'
+    })
+    if (modelComparison !== 0) return modelComparison
+
+    return left.value.localeCompare(right.value, undefined, {
+      sensitivity: 'base'
+    })
+  })
+}
+
+export const buildModelSelectOption = (option: {
+  value: string
+  title: string
+  modelName: string
+  description?: string
+  aliases?: string[]
+  serviceKey?: string
+  serviceTitle?: string
+  searchTerms?: Array<string | undefined>
+}): ModelSelectOptionData => {
+  const description = option.description?.trim()
+  const aliases = Array.from(new Set((option.aliases ?? []).filter(Boolean)))
+  const tooltipLines = [
+    ...aliases.filter(alias => alias !== option.title),
+    option.modelName !== option.title ? option.modelName : undefined,
+    description
+  ].filter((item): item is string => Boolean(item))
+
+  return {
+    value: option.value,
+    title: option.title,
+    description,
+    aliases,
+    modelName: option.modelName,
+    tooltipLines,
+    serviceKey: option.serviceKey,
+    serviceTitle: option.serviceTitle,
+    searchText: [
+      option.title,
+      option.modelName,
+      option.value,
+      option.serviceTitle,
+      option.serviceKey,
+      description,
+      ...aliases,
+      ...(option.searchTerms ?? [])
+    ]
+      .filter(Boolean)
+      .join(' '),
+    displayLabel: option.title
+  }
+}

package/src/hooks/chat/model-selector-data-types.ts

@@ -0,0 +1,27 @@
+export interface ModelSelectOptionData {
+  value: string
+  title: string
+  description?: string
+  aliases: string[]
+  modelName: string
+  tooltipLines: string[]
+  serviceKey?: string
+  serviceTitle?: string
+  searchText: string
+  displayLabel: string
+}
+
+export interface ModelSelectGroupData {
+  key: string
+  title: string
+  description?: string
+  options: ModelSelectOptionData[]
+}
+
+export interface ModelSelectorData {
+  servicePreviewOptions: ModelSelectOptionData[]
+  recommendedOptions: ModelSelectOptionData[]
+  moreModelGroups: ModelSelectGroupData[]
+  flatGroups: ModelSelectGroupData[]
+  searchOptions: ModelSelectOptionData[]
+}

package/src/hooks/chat/model-selector-data.ts

@@ -0,0 +1,109 @@
+import type {
+  AdapterBuiltinModel,
+  ModelMetadataConfig,
+  ModelServiceConfig,
+  RecommendedModelConfig
+} from '@vibe-forge/types'
+
+import type { ServiceModelEntry } from './model-selector'
+import { resolveModelServiceTitle } from './model-selector'
+import {
+  buildBuiltinModelGroups,
+  buildRecommendedModelOptions,
+  buildServiceModelGroups
+} from './model-selector-data-builders'
+import { sortOptionsByDisplayLabel } from './model-selector-data-option-utils'
+import type { ModelSelectGroupData, ModelSelectOptionData, ModelSelectorData } from './model-selector-data-types'
+
+export type { ModelSelectGroupData, ModelSelectOptionData, ModelSelectorData } from './model-selector-data-types'
+
+export const buildModelSelectorData = (params: {
+  activeBuiltinModels: Record<string, AdapterBuiltinModel[]>
+  availableServiceModels: ServiceModelEntry[]
+  defaultModelService?: string
+  mergedModels: Record<string, ModelMetadataConfig>
+  mergedModelServices: Record<string, ModelServiceConfig>
+  recommendedModels: RecommendedModelConfig[]
+  recommendedGroupTitle: string
+  servicePreviewGroupTitle: string
+  builtinGroupTitle: (adapterKey: string) => string
+}): ModelSelectorData => {
+  const modelToService = new Map<string, { key: string; title: string }>()
+  for (const entry of params.availableServiceModels) {
+    const serviceValue = params.mergedModelServices[entry.serviceKey]
+    const serviceTitle = resolveModelServiceTitle({
+      serviceKey: entry.serviceKey,
+      service: serviceValue
+    })
+    if (!modelToService.has(entry.model)) {
+      modelToService.set(entry.model, { key: entry.serviceKey, title: serviceTitle })
+    }
+  }
+
+  const serviceGroups = buildServiceModelGroups({
+    mergedModelServices: params.mergedModelServices,
+    mergedModels: params.mergedModels
+  })
+  const builtinGroups = buildBuiltinModelGroups({
+    activeBuiltinModels: params.activeBuiltinModels,
+    builtinGroupTitle: params.builtinGroupTitle,
+    mergedModels: params.mergedModels
+  })
+  const configuredRecommendedOptions = buildRecommendedModelOptions({
+    availableServiceModels: params.availableServiceModels,
+    defaultModelService: params.defaultModelService,
+    mergedModels: params.mergedModels,
+    mergedModelServices: params.mergedModelServices,
+    recommendedModels: params.recommendedModels,
+    modelToService
+  })
+
+  const servicePreviewOptions = serviceGroups
+    .map(group => group.options[0] ?? null)
+    .filter((option): option is ModelSelectOptionData => option != null)
+
+  const recommendedOptions = sortOptionsByDisplayLabel(configuredRecommendedOptions)
+
+  const flatGroups: ModelSelectGroupData[] = []
+  if (servicePreviewOptions.length > 0) {
+    flatGroups.push({
+      key: 'service-preview',
+      title: params.servicePreviewGroupTitle,
+      options: servicePreviewOptions
+    })
+  }
+
+  if (recommendedOptions.length > 0) {
+    flatGroups.push({
+      key: 'recommended',
+      title: params.recommendedGroupTitle,
+      options: recommendedOptions
+    })
+  }
+
+  const moreModelGroups = [...builtinGroups, ...serviceGroups]
+  flatGroups.push(...moreModelGroups)
+
+  const searchOptionMap = new Map<string, ModelSelectOptionData>()
+  for (
+    const option of [
+      ...recommendedOptions,
+      ...servicePreviewOptions,
+      ...moreModelGroups.flatMap(group => group.options)
+    ]
+  ) {
+    if (!searchOptionMap.has(option.value)) {
+      searchOptionMap.set(option.value, option)
+    }
+  }
+
+  const searchOptions = Array.from(searchOptionMap.values())
+
+  return {
+    servicePreviewOptions,
+    recommendedOptions,
+    moreModelGroups,
+    flatGroups,
+    searchOptions
+  }
+}

package/src/hooks/chat/model-selector-recommendations.ts

@@ -0,0 +1,69 @@
+import type { ConfigSection, RecommendedModelConfig } from '@vibe-forge/types'
+
+const MODEL_SELECTOR_RECOMMENDATION_PLACEMENT = 'modelSelector' as const
+
+const isRecommendedModelConfig = (value: unknown): value is RecommendedModelConfig => (
+  value != null &&
+  typeof value === 'object' &&
+  typeof (value as RecommendedModelConfig).model === 'string' &&
+  (value as RecommendedModelConfig).model.trim() !== ''
+)
+
+export const isModelSelectorRecommendation = (value: RecommendedModelConfig) => (
+  value.placement == null || value.placement === MODEL_SELECTOR_RECOMMENDATION_PLACEMENT
+)
+
+export const buildRecommendedModelKey = ({
+  model,
+  service
+}: {
+  model: string
+  service?: string
+}) => `${service ?? ''}::${model}`
+
+export const buildUpdatedUserGeneralSection = ({
+  currentGeneral,
+  recommendedModels
+}: {
+  currentGeneral?: ConfigSection['general']
+  recommendedModels: RecommendedModelConfig[]
+}) => ({
+  ...(currentGeneral ?? {}),
+  recommendedModels: recommendedModels.length > 0 ? recommendedModels : undefined
+})
+
+export const toggleModelSelectorRecommendation = ({
+  currentRecommendedModels,
+  nextRecommendedModel
+}: {
+  currentRecommendedModels: unknown
+  nextRecommendedModel: RecommendedModelConfig
+}) => {
+  const normalizedCurrentRecommendedModels = Array.isArray(currentRecommendedModels)
+    ? currentRecommendedModels.filter(isRecommendedModelConfig)
+    : []
+  const nextRecommendedModelKey = buildRecommendedModelKey(nextRecommendedModel)
+  const isCurrentlyRecommended = normalizedCurrentRecommendedModels.some(item => (
+    isModelSelectorRecommendation(item) &&
+    buildRecommendedModelKey(item) === nextRecommendedModelKey
+  ))
+
+  return {
+    isCurrentlyRecommended,
+    recommendedModels: isCurrentlyRecommended
+      ? normalizedCurrentRecommendedModels.filter(item =>
+        !(
+          isModelSelectorRecommendation(item) &&
+          buildRecommendedModelKey(item) === nextRecommendedModelKey
+        )
+      )
+      : [
+        {
+          service: nextRecommendedModel.service,
+          model: nextRecommendedModel.model,
+          placement: MODEL_SELECTOR_RECOMMENDATION_PLACEMENT
+        },
+        ...normalizedCurrentRecommendedModels
+      ]
+  }
+}

package/src/hooks/chat/model-selector.ts

@@ -9,6 +9,7 @@ import {
   resolveAdapterModelCompatibility,
   resolveDefaultModelSelection,
   resolveModelDefaultAdapter,
+  resolveModelDisplayMetadata,
   resolveModelSelection,
   resolveServiceModelSelector
 } from '@vibe-forge/utils/model-selection'
@@ -21,9 +22,17 @@ export {
   normalizeNonEmptyString,
   parseServiceModelSelector,
   resolveAdapterModelCompatibility,
+  resolveModelDisplayMetadata,
   resolveServiceModelSelector
 }
 
+export const resolveModelServiceTitle = (params: {
+  serviceKey: string
+  service?: { title?: string | null } | null
+}) => {
+  return normalizeNonEmptyString(params.service?.title) ?? params.serviceKey
+}
+
 export const resolveChatModelSelection = (params: {
   value?: string
   builtinModels?: Iterable<string>

package/src/hooks/chat/use-chat-interaction.ts

@@ -1,21 +1,26 @@
 import { useCallback, useState } from 'react'
 
-import { connectionManager } from '#~/connectionManager.js'
+import { respondSessionInteraction } from '#~/api/sessions'
 import type { AskUserQuestionParams } from '@vibe-forge/core'
 
-export function useChatInteraction({ sessionId }: { sessionId?: string }) {
+export function useChatInteraction({
+  sessionId
+}: {
+  sessionId?: string
+}) {
   const [interactionRequest, setInteractionRequest] = useState<{ id: string; payload: AskUserQuestionParams } | null>(
     null
   )
 
   const handleInteractionResponse = useCallback((id: string, data: string | string[]) => {
     if (!sessionId) return
-    connectionManager.send(sessionId, {
-      type: 'interaction_response',
-      id,
-      data
-    })
-    setInteractionRequest(null)
+    void respondSessionInteraction(sessionId, id, data)
+      .then(() => {
+        setInteractionRequest(current => (current?.id === id ? null : current))
+      })
+      .catch((error) => {
+        console.error('Failed to submit interaction response:', error)
+      })
   }, [sessionId])
 
   return {