refactor(client): keep settings constants and schemas off the client contract surfaces

The /client entry of a UI plugin exports no values beyond what cordis
loading needs; the theme constants block returns to type-only re-exports,
the per-namespace schemas move into the shared *-settings modules instead
of widening the host entries, and same-package specs import those internals
directly per the export discipline in packages/client/AGENTS.md.
This commit is contained in:
Yichen Jiang
2026-08-07 23:30:04 +08:00
parent 638c9e4bd7
commit 53c66ecbeb
9 changed files with 28 additions and 39 deletions

View File

@@ -1,22 +1,14 @@
/** Host registration for the browser locale preference. */ /** Host registration for the browser locale preference. */
import type { Context } from 'cordis' import type { Context } from 'cordis'
import z from 'schemastery'
import { settingsNamespace } from '@deepseek-ai/dsh-settings' import { settingsNamespace } from '@deepseek-ai/dsh-settings'
import { import { LOCALE_SETTINGS_NAMESPACE, LocaleSettingsSchema } from './locale-settings.ts'
LOCALE_IDS, LOCALE_PREFERENCE_FIELD, LOCALE_SETTINGS_NAMESPACE, type LocaleSettings,
} from './locale-settings.ts'
export { export {
LOCALE_IDS, LOCALE_PREFERENCE_FIELD, LOCALE_SETTINGS_NAMESPACE, LOCALE_IDS, LOCALE_PREFERENCE_FIELD, LOCALE_SETTINGS_NAMESPACE,
type LocaleId, type LocaleSettings, type LocaleId, type LocaleSettings,
} from './locale-settings.ts' } from './locale-settings.ts'
/** Durable locale schema; also the wire envelope the browser scope validates against. */
export const LocaleSettingsSchema: z<LocaleSettings> = z.object({
[LOCALE_PREFERENCE_FIELD]: z.union([...LOCALE_IDS]).required(false),
})
/** /**
* Register the durable locale section when a settings provider exists. * Register the durable locale section when a settings provider exists.
* @param ctx - Host context whose optional settings service owns the section. * @param ctx - Host context whose optional settings service owns the section.

View File

@@ -1,5 +1,7 @@
/** Locale preference stored in the Host user-settings document. */ /** Locale preference stored in the Host user-settings document. */
import z from 'schemastery'
/** Settings namespace owned by the locale plugin. */ /** Settings namespace owned by the locale plugin. */
export const LOCALE_SETTINGS_NAMESPACE = 'locale' export const LOCALE_SETTINGS_NAMESPACE = 'locale'
@@ -17,3 +19,8 @@ export interface LocaleSettings {
/** Explicit locale selection; absence delegates to the browser. */ /** Explicit locale selection; absence delegates to the browser. */
preference?: LocaleId preference?: LocaleId
} }
/** Durable locale schema; also the wire envelope the browser scope validates against. */
export const LocaleSettingsSchema: z<LocaleSettings> = z.object({
[LOCALE_PREFERENCE_FIELD]: z.union([...LOCALE_IDS]).required(false),
})

View File

@@ -8,8 +8,7 @@ import {
apply, inject, SETTINGS_NS, apply, inject, SETTINGS_NS,
} from '@deepseek-ai/dsh-client-locale/client' } from '@deepseek-ai/dsh-client-locale/client'
import type { LanguageRowInjected, LocaleService } from '@deepseek-ai/dsh-client-locale/client' import type { LanguageRowInjected, LocaleService } from '@deepseek-ai/dsh-client-locale/client'
import { LOCALE_SETTINGS_NAMESPACE } from '../src/locale-settings.ts' import { LOCALE_SETTINGS_NAMESPACE, LocaleSettingsSchema } from '../src/locale-settings.ts'
import { LocaleSettingsSchema } from '../src/index.ts'
import { LanguageRow } from '../src/client/LanguageRow.tsx' import { LanguageRow } from '../src/client/LanguageRow.tsx'
import type { createLanguageRowStore } from '../src/client/settings-store.ts' import type { createLanguageRowStore } from '../src/client/settings-store.ts'

View File

@@ -1,23 +1,14 @@
/** Host registration for browser conversation preferences. */ /** Host registration for browser conversation preferences. */
import type { Context } from 'cordis' import type { Context } from 'cordis'
import z from 'schemastery'
import { settingsNamespace } from '@deepseek-ai/dsh-settings' import { settingsNamespace } from '@deepseek-ai/dsh-settings'
import { import { CONVERSATION_SETTINGS_NAMESPACE, ConversationSettingsSchema } from './submission-settings.ts'
BUSY_ENTER_BEHAVIORS, BUSY_ENTER_FIELD, CONVERSATION_SETTINGS_NAMESPACE,
DEFAULT_BUSY_ENTER_BEHAVIOR, type ConversationSettings,
} from './submission-settings.ts'
export { export {
BUSY_ENTER_BEHAVIORS, BUSY_ENTER_FIELD, CONVERSATION_SETTINGS_NAMESPACE, BUSY_ENTER_BEHAVIORS, BUSY_ENTER_FIELD, CONVERSATION_SETTINGS_NAMESPACE,
DEFAULT_BUSY_ENTER_BEHAVIOR, type BusyEnterBehavior, type ConversationSettings, DEFAULT_BUSY_ENTER_BEHAVIOR, type BusyEnterBehavior, type ConversationSettings,
} from './submission-settings.ts' } from './submission-settings.ts'
/** Durable conversation schema; also the wire envelope the browser scope validates against. */
export const ConversationSettingsSchema: z<ConversationSettings> = z.object({
[BUSY_ENTER_FIELD]: z.union([...BUSY_ENTER_BEHAVIORS]).default(DEFAULT_BUSY_ENTER_BEHAVIOR),
})
/** /**
* Register the durable conversation section when a settings provider exists. * Register the durable conversation section when a settings provider exists.
* @param ctx - Host context whose optional settings service owns the section. * @param ctx - Host context whose optional settings service owns the section.

View File

@@ -1,5 +1,7 @@
/** Busy-Enter preference stored in the Host user-settings document. */ /** Busy-Enter preference stored in the Host user-settings document. */
import z from 'schemastery'
/** Settings namespace owned by the conversation plugin. */ /** Settings namespace owned by the conversation plugin. */
export const CONVERSATION_SETTINGS_NAMESPACE = 'ui-conversation' export const CONVERSATION_SETTINGS_NAMESPACE = 'ui-conversation'
@@ -20,3 +22,8 @@ export interface ConversationSettings {
/** Delivery mode for plain Enter while the addressed agent is busy. */ /** Delivery mode for plain Enter while the addressed agent is busy. */
busyEnter: BusyEnterBehavior busyEnter: BusyEnterBehavior
} }
/** Durable conversation schema; also the wire envelope the browser scope validates against. */
export const ConversationSettingsSchema: z<ConversationSettings> = z.object({
[BUSY_ENTER_FIELD]: z.union([...BUSY_ENTER_BEHAVIORS]).default(DEFAULT_BUSY_ENTER_BEHAVIOR),
})

View File

@@ -26,10 +26,7 @@ import {
export type { AppearanceRowComponentProps, AppearanceRowInjected } from './AppearanceRow.tsx' export type { AppearanceRowComponentProps, AppearanceRowInjected } from './AppearanceRow.tsx'
export type { AppearanceRowState } from './settings-store.ts' export type { AppearanceRowState } from './settings-store.ts'
export type { ThemeKey } from './locales.ts' export type { ThemeKey } from './locales.ts'
export { export type { ThemePreference, ThemeSettings } from '../theme-settings.ts'
DEFAULT_PREFERENCE, THEME_PREFERENCE_FIELD, THEME_PREFERENCES, THEME_SETTINGS_NAMESPACE,
type ThemePreference, type ThemeSettings,
} from '../theme-settings.ts'
/** Namespace owning this feature's settings-row copy. */ /** Namespace owning this feature's settings-row copy. */
export const SETTINGS_NS = 'settings.theme' export const SETTINGS_NS = 'settings.theme'

View File

@@ -1,23 +1,14 @@
/** Host registration for the browser theme preference. */ /** Host registration for the browser theme preference. */
import type { Context } from 'cordis' import type { Context } from 'cordis'
import z from 'schemastery'
import { settingsNamespace } from '@deepseek-ai/dsh-settings' import { settingsNamespace } from '@deepseek-ai/dsh-settings'
import { import { THEME_SETTINGS_NAMESPACE, ThemeSettingsSchema } from './theme-settings.ts'
DEFAULT_PREFERENCE, THEME_PREFERENCE_FIELD, THEME_PREFERENCES, THEME_SETTINGS_NAMESPACE,
type ThemeSettings,
} from './theme-settings.ts'
export { export {
DEFAULT_PREFERENCE, THEME_PREFERENCE_FIELD, THEME_PREFERENCES, THEME_SETTINGS_NAMESPACE, DEFAULT_PREFERENCE, THEME_PREFERENCE_FIELD, THEME_PREFERENCES, THEME_SETTINGS_NAMESPACE,
type ThemePreference, type ThemeSettings, type ThemePreference, type ThemeSettings,
} from './theme-settings.ts' } from './theme-settings.ts'
/** Durable theme schema; also the wire envelope the browser scope validates against. */
export const ThemeSettingsSchema: z<ThemeSettings> = z.object({
[THEME_PREFERENCE_FIELD]: z.union([...THEME_PREFERENCES]).default(DEFAULT_PREFERENCE),
})
/** /**
* Register the durable theme section when a settings provider exists. * Register the durable theme section when a settings provider exists.
* @param ctx - Host context whose optional settings service owns the section. * @param ctx - Host context whose optional settings service owns the section.

View File

@@ -1,5 +1,7 @@
/** Theme preferences stored in the Host user-settings document. */ /** Theme preferences stored in the Host user-settings document. */
import z from 'schemastery'
/** Built-in preferences accepted at the registry and settings boundaries. */ /** Built-in preferences accepted at the registry and settings boundaries. */
export const THEME_PREFERENCES = ['light', 'dark', 'system'] as const export const THEME_PREFERENCES = ['light', 'dark', 'system'] as const
@@ -21,6 +23,11 @@ export interface ThemeSettings {
preference: ThemePreference preference: ThemePreference
} }
/** Durable theme schema; also the wire envelope the browser scope validates against. */
export const ThemeSettingsSchema: z<ThemeSettings> = z.object({
[THEME_PREFERENCE_FIELD]: z.union([...THEME_PREFERENCES]).default(DEFAULT_PREFERENCE),
})
/** /**
* Narrow one wire or registry value to a persistable preference. * Narrow one wire or registry value to a persistable preference.
* @param value - value crossing the settings or registry boundary. * @param value - value crossing the settings or registry boundary.

View File

@@ -6,11 +6,9 @@ import { describe, expect, it, vi } from 'vitest'
import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client' import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
import { LocaleService } from '@deepseek-ai/dsh-client-locale/client' import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
import { usePinnedBrowserLanguages } from '@deepseek-ai/dsh-client-test-runtime' import { usePinnedBrowserLanguages } from '@deepseek-ai/dsh-client-test-runtime'
import { import { apply, inject, SETTINGS_NS } from '@deepseek-ai/dsh-client-ui-theme/client'
apply, inject, SETTINGS_NS, THEME_SETTINGS_NAMESPACE,
} from '@deepseek-ai/dsh-client-ui-theme/client'
import type { AppearanceRowInjected, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client' import type { AppearanceRowInjected, ThemeService } from '@deepseek-ai/dsh-client-ui-theme/client'
import { ThemeSettingsSchema } from '@deepseek-ai/dsh-client-ui-theme' import { THEME_SETTINGS_NAMESPACE, ThemeSettingsSchema } from '../src/theme-settings.ts'
import { AppearanceRow } from '../src/client/AppearanceRow.tsx' import { AppearanceRow } from '../src/client/AppearanceRow.tsx'
import type { createAppearanceRowStore } from '../src/client/settings-store.ts' import type { createAppearanceRowStore } from '../src/client/settings-store.ts'