dsh-plugin-effort-declare 0.1.0 → 0.1.1

package/src/client/EffortDeclareSection.tsx

@@ -31,7 +31,7 @@ import { buildSaveOps } from '../core/path-ops.ts'
 import { cloneModels, cloneObject } from '../core/paths.ts'
 import { modelEffortError } from '../core/validate.ts'
 import { loadDrafts } from './load-drafts.ts'
-import type { SchemaOps } from './schema-ops.ts'
+import { validateSaveDraft, type SchemaOps } from './schema-ops.ts'
 import type { EffortDeclareKey } from './locales.ts'
 import css from './effort-declare.module.css'
 
@@ -41,7 +41,6 @@ export interface EffortDeclareSectionInjected {
   api: Pick<IApiClient, 'settings' | 'llm'>
   describe: SettingsDescribeFace
   schema: SchemaOps
-  t: (key: EffortDeclareKey) => string
   subscribeInvalidate: (listener: (source: InvalidationSource) => void) => () => void
 }
 
@@ -341,7 +340,7 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
     void loadDrafts(api, describe, schema).then((result) => {
       if (!generationIsCurrent(generationRef, generation)) return
       setWritable(result.writable)
-      if (result.formats.length > 0) setFormats(result.formats)
+      setFormats(result.formats)
       if (result.error !== undefined) {
         setStatus('error')
         setError(result.error)
@@ -350,9 +349,13 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
       const merged = mergeLoadedDrafts(draftsRef.current, result.drafts, { preserveDirty })
       setDrafts(merged.drafts)
       if (merged.conflicted.length > 0) {
-        setNotices(Object.fromEntries(
-          merged.conflicted.map(provider => [provider, { kind: 'conflict' as const, text: t('dirtyConflict') }]),
-        ))
+        setNotices(current => {
+          const next = { ...current }
+          for (const provider of merged.conflicted) {
+            next[provider] = { kind: 'conflict', text: t('dirtyConflict') }
+          }
+          return next
+        })
       }
       setStatus('ready')
     }, (failure: unknown) => {
@@ -366,21 +369,32 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
 
   useEffect(() => {
     if (props.subscribeInvalidate === undefined) return undefined
-    return props.subscribeInvalidate(() => { reload(true) })
+    return props.subscribeInvalidate((source) => {
+      if (source === 'settings' || source === 'directory') reload(true)
+    })
   }, [props.subscribeInvalidate, reload])
 
+  const patchNotice = (provider: string, notice: CardNotice | undefined): void => {
+    setNotices(current => {
+      const copy = { ...current }
+      if (notice === undefined) delete copy[provider]
+      else copy[provider] = notice
+      return copy
+    })
+  }
+
   const save = async (draft: RouteDraft): Promise<void> => {
-    if (api === undefined || describe === undefined) return
+    if (api === undefined || describe === undefined || schema === undefined) return
     if (status === 'loading' || busyRoute !== null) return
     const blocking = draft.models
       .map(row => errorText(modelEffortError(row), t))
       .find(text => text !== undefined)
     if (blocking !== undefined) {
-      setNotices({ [draft.provider]: { kind: 'error', text: blocking } })
+      patchNotice(draft.provider, { kind: 'error', text: blocking })
       return
     }
     setBusyRoute(draft.provider)
-    setNotices({})
+    patchNotice(draft.provider, undefined)
     try {
       const ops = buildSaveOps({
         settingsPath: draft.settingsPath,
@@ -393,18 +407,44 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
         setDrafts(current => current.map(row => row.provider === draft.provider ? alignDraft(row) : row))
         return
       }
+      const willWriteCompat = ops.some(op => (
+        op.path.length > draft.settingsPath.length && op.path[draft.settingsPath.length] === 'compat'
+      ))
+      const pi = describe.getSnapshot().view?.namespaces.find(view => view.ns === LLM_PI_AI_NS)
+      if (pi !== undefined) {
+        let root: unknown
+        try {
+          root = schema.rehydrate(pi.schema)
+        } catch {
+          root = undefined
+        }
+        if (root !== undefined) {
+          const schemaError = validateSaveDraft(
+            schema,
+            root,
+            draft.settingsPath,
+            draft.models,
+            draft.compat,
+            willWriteCompat,
+          )
+          if (schemaError !== undefined) {
+            patchNotice(draft.provider, { kind: 'error', text: schemaError })
+            return
+          }
+        }
+      }
       const response = await api.settings.mutate({
         ns: LLM_PI_AI_NS,
         ops,
         expectedRevision: draft.revision,
       })
       if (!response.result.ok) {
-        setNotices({
-          [draft.provider]: {
-            kind: 'error',
-            text: response.result.error.code === 'settings-conflict' ? t('conflict') : response.result.error.message,
-          },
+        const conflict = response.result.error.code === 'settings-conflict'
+        patchNotice(draft.provider, {
+          kind: conflict ? 'conflict' : 'error',
+          text: conflict ? t('conflict') : response.result.error.message,
         })
+        if (conflict) reload(true)
         return
       }
       const view = response.result.value
@@ -413,13 +453,11 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
         user: view.user ?? {},
         revision: view.revision,
       }))
-      setNotices({ [draft.provider]: { kind: 'saved', text: t('saved') } })
+      patchNotice(draft.provider, { kind: 'saved', text: t('saved') })
     } catch (failure) {
-      setNotices({
-        [draft.provider]: {
-          kind: 'error',
-          text: failure instanceof Error ? failure.message : t('loadError'),
-        },
+      patchNotice(draft.provider, {
+        kind: 'error',
+        text: failure instanceof Error ? failure.message : t('loadError'),
       })
     } finally {
       setBusyRoute(null)
@@ -429,6 +467,10 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
   const showLoading = status === 'loading' && drafts.length === 0
   const showEmpty = status === 'ready' && drafts.length === 0
   const showList = drafts.length > 0
+  const hasCardFailure = Object.values(notices).some(
+    notice => notice.kind === 'conflict' || notice.kind === 'error',
+  )
+  const showReload = status === 'error' || hasCardFailure || showEmpty || !writable || status === 'loading' || showList
 
   return (
     <div className={css.section}>
@@ -437,7 +479,7 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
       {!writable && status === 'ready' ? <p className={css.notice}>{t('readOnly')}</p> : null}
       {showLoading ? <p className={css.intro}>{t('loading')}</p> : null}
       {status === 'error' ? <p className={css.error}>{error}</p> : null}
-      {status === 'error'
+      {showReload
         ? (
           <button type="button" className={css.secondaryButton} onClick={() => { reload(true) }}>{t('reload')}</button>
         )
@@ -464,20 +506,12 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
                 notice={notices[draft.provider]}
                 t={t}
                 onChange={(next) => {
-                  setNotices(current => {
-                    const copy = { ...current }
-                    delete copy[next.provider]
-                    return copy
-                  })
+                  patchNotice(next.provider, undefined)
                   setDrafts(current => current.map(row => row.provider === next.provider ? next : row))
                 }}
                 onSave={(next) => { void save(next) }}
                 onCancel={(next) => {
-                  setNotices(current => {
-                    const copy = { ...current }
-                    delete copy[next.provider]
-                    return copy
-                  })
+                  patchNotice(next.provider, undefined)
                   setDrafts(current => current.map(row => row.provider === next.provider
                     ? {
                         ...row,

package/src/client/README.en.md

@@ -17,11 +17,11 @@ Cross-plugin work uses Cordis services only (`connection`, `settingsScope`, `set
 
 | File | Role |
 | --- | --- |
-| [`index.ts`](./index.ts) | Registers zh/en copy, CSS (`ctx.effect` insert/remove), and `settings.section` (id `effort-declare`, order 15). Subscribes in `apply` to `settings/document-updated` (`llm-pi-ai` only), `llm/adapters-updated`, and `connection/reset`. |
+| [`index.ts`](./index.ts) | Registers zh/en copy, CSS (`ctx.effect` insert/remove), and `settings.section` (id `effort-declare`, order 12). Subscribes in `apply` to the mirror `describe.subscribe`, `settings/document-updated` (`llm-pi-ai` only), `llm/adapters-updated`, and `connection/reset`. `locale: NS` lets the framework inject `t`; `inject` only returns `api` / `describe` / `schema` / `subscribeInvalidate`. |
 | [`EffortDeclareSection.tsx`](./EffortDeclareSection.tsx) | Route cards, presets, Off tri-state, advanced protocol switches, save and cancel. |
-| [`load-drafts.ts`](./load-drafts.ts) | Builds drafts from `llm.providers` + the settings mirror; drafts come from `user`, protocol classification may use `value`. |
+| [`load-drafts.ts`](./load-drafts.ts) | Builds drafts from `llm.providers` + the settings mirror; drafts come from `user`, protocol classification may use `value`. `thinkingFormat` choices come only from the live schema union. |
 | [`locales.ts`](./locales.ts) | Copy namespace `plugin-effort-declare`. |
 | [`effort-declare.module.css`](./effort-declare.module.css) | `--dsw-alias-*` tokens only, so dark theme stays correct. |
-| [`schema-ops.ts`](./schema-ops.ts) | Binds `settingsSchema` as plain callbacks so the service identity is not passed into React. |
+| [`schema-ops.ts`](./schema-ops.ts) | Binds `settingsSchema` as plain callbacks (including `validate`) so the service identity is not passed into React. |
 
 Visual language follows the official Models page, not `--ds-*` variables with light-mode fallbacks.

package/src/client/README.md

@@ -17,11 +17,11 @@
 
 | 文件 | 说明 |
 | --- | --- |
-| [`index.ts`](./index.ts) | 注册 zh/en 文案、CSS（`ctx.effect` 插入/移除）与 `settings.section`（id `effort-declare`，order 15）。在 `apply` 里订阅 `settings/document-updated`（仅 `llm-pi-ai`）、`llm/adapters-updated`、`connection/reset`。 |
+| [`index.ts`](./index.ts) | 注册 zh/en 文案、CSS（`ctx.effect` 插入/移除）与 `settings.section`（id `effort-declare`，order 12）。在 `apply` 里订阅镜像 `describe.subscribe`、`settings/document-updated`（仅 `llm-pi-ai`）、`llm/adapters-updated`、`connection/reset`。`locale: NS` 由框架注入 `t`，inject 只传 `api` / `describe` / `schema` / `subscribeInvalidate`。 |
 | [`EffortDeclareSection.tsx`](./EffortDeclareSection.tsx) | 路由卡片、预设、Off 三态、高级协议开关、保存与取消。 |
-| [`load-drafts.ts`](./load-drafts.ts) | 从 `llm.providers` + 镜像组装草稿；草稿取自 `user`，协议分类可用 `value`。 |
+| [`load-drafts.ts`](./load-drafts.ts) | 从 `llm.providers` + 镜像组装草稿；草稿取自 `user`，协议分类可用 `value`。`thinkingFormat` 可选项只来自现场 schema union。 |
 | [`locales.ts`](./locales.ts) | 文案 namespace `plugin-effort-declare`。 |
 | [`effort-declare.module.css`](./effort-declare.module.css) | 仅使用 `--dsw-alias-*` 设计令牌，保证暗色主题正确。 |
-| [`schema-ops.ts`](./schema-ops.ts) | 将 `settingsSchema` 收成普通回调，避免把服务身份带进 React。 |
+| [`schema-ops.ts`](./schema-ops.ts) | 将 `settingsSchema` 收成普通回调（含 `validate`），避免把服务身份带进 React。 |
 
 样式与交互对齐官方模型页，而不是带浅色 fallback 的 `--ds-*` 变量。

package/src/client/index.ts

@@ -53,8 +53,12 @@ export function apply(ctx: ClientContext): void {
     ),
     getPath: (value, path) => settingsSchema.getPath(value, path),
     hasPath: (value, path) => settingsSchema.hasPath(value, path),
+    validate: (node, draft) => settingsSchema.validate(
+      node as Parameters<typeof settingsSchema.validate>[0],
+      draft,
+    ),
   })
-  const t = ctx.locale.bind(NS) as EffortDeclareSectionInjected['t']
+  const t = ctx.locale.bind(NS)
   const describe = ctx.settingsScope.describe()
   const invalidation = new Set<(source: InvalidationSource) => void>()
 
@@ -63,6 +67,7 @@ export function apply(ctx: ClientContext): void {
       for (const listener of invalidation) listener(source)
     }
     const disposers = [
+      describe.subscribe(() => { emit('settings') }),
       ctx.remote.$on('settings/document-updated', (ns: string) => {
         if (ns !== LLM_PI_AI_NS) return
         emit('settings')
@@ -83,14 +88,13 @@ export function apply(ctx: ClientContext): void {
   ctx.slots.inject('settings.section', () => ctx.slots.register({
     name: 'settings.section',
     id: 'effort-declare',
-    order: 15,
+    order: 12,
     label: () => t('nav'),
     locale: NS,
     inject: (): EffortDeclareSectionInjected => ({
       api: connection.api,
       describe,
       schema,
-      t,
       subscribeInvalidate,
     }),
   }, EffortDeclareSection))

package/src/client/load-drafts.ts

@@ -5,7 +5,6 @@
 import type { IApiClient, SettingsNamespaceView } from '@deepseek-ai/dsh-api-remotes/client'
 import type { SettingsDescribeFace } from '@deepseek-ai/dsh-client-ui-settings/client'
 import {
-  FALLBACK_THINKING_FORMATS,
   LLM_PI_AI_NS,
   SCHEMA_PROBE_ROUTE,
 } from '../core/catalog.ts'
@@ -29,6 +28,9 @@ export interface LoadDraftsResult {
 /**
  * First paint: `ensure()` (reads only from idle). Never treat ensure as refresh.
  * Callers that must not apply a stale settlement compare generation themselves.
+ *
+ * `formats` is the live schema union only. Empty means the dropdown has no
+ * writable choices (stored values stay visible via `thinkingFormatChoices`).
  */
 export async function loadDrafts(
   api: Pick<IApiClient, 'llm'>,
@@ -38,20 +40,20 @@ export async function loadDrafts(
   await describe.ensure()
   const mirrored = describe.getSnapshot()
   if (mirrored.view === undefined) {
-    return { writable: false, formats: [...FALLBACK_THINKING_FORMATS], drafts: [], error: mirrored.error ?? undefined }
+    return { writable: false, formats: [], drafts: [], error: mirrored.error ?? undefined }
   }
   const providersResponse = await api.llm.providers({})
   if (!providersResponse.result.ok) {
     return {
       writable: mirrored.view.writable,
-      formats: [...FALLBACK_THINKING_FORMATS],
+      formats: [],
       drafts: [],
       error: providersResponse.result.error.message,
     }
   }
   const namespaces = new Map(mirrored.view.namespaces.map((view: SettingsNamespaceView) => [view.ns, view]))
   const pi = namespaces.get(LLM_PI_AI_NS)
-  let formats: string[] = [...FALLBACK_THINKING_FORMATS]
+  let formats: string[] = []
   let schemaDefaultApi: string | undefined
   if (pi !== undefined) {
     try {
@@ -61,7 +63,7 @@ export async function loadDrafts(
       if (fromSchema.length > 0) formats = fromSchema
       schemaDefaultApi = schemaDefaultString(schema.nodeAtPath(root, ['providers', SCHEMA_PROBE_ROUTE, 'api']))
     } catch {
-      // Live schema walk is best-effort; fallback list is test-pinned.
+      // Live schema walk is best-effort; UI options stay empty rather than a handwritten list.
     }
   }
   const drafts: RouteDraft[] = []

package/src/client/locales.ts

@@ -77,7 +77,7 @@ export const zh: Record<EffortDeclareKey, string> = {
   clear: '清除本模型声明',
   advanced: '高级：协议方言',
   thinkingFormat: 'thinkingFormat',
-  thinkingFormatDefault: '默认（openai）',
+  thinkingFormatDefault: '默认（省略该键）',
   supportsDeveloperRole: '系统提示走 system 而不是 developer（supportsDeveloperRole: false）',
   supportsReasoningEffort: '不发 reasoning_effort，只发开关（supportsReasoningEffort: false）',
   developerTrueHint: '当前文档是 supportsDeveloperRole: true。v1 只能强制 false 或缺席；勾选会写成 false，取消勾选会删除该键。',
@@ -120,7 +120,7 @@ export const en: Record<EffortDeclareKey, string> = {
   clear: 'Clear this model’s declaration',
   advanced: 'Advanced: protocol dialect',
   thinkingFormat: 'thinkingFormat',
-  thinkingFormatDefault: 'Default (openai)',
+  thinkingFormatDefault: 'Default (omit the key)',
   supportsDeveloperRole: 'Send system prompts as system, not developer (supportsDeveloperRole: false)',
   supportsReasoningEffort: 'Do not send reasoning_effort; switch only (supportsReasoningEffort: false)',
   developerTrueHint: 'The document has supportsDeveloperRole: true. v1 can only force false or omit the key; checking writes false, unchecking deletes the key.',

package/src/client/schema-ops.ts

@@ -7,6 +7,11 @@ export interface SchemaOps {
   nodeAtPath: (root: unknown, path: readonly string[]) => unknown
   getPath: (value: unknown, path: readonly string[]) => unknown
   hasPath: (value: unknown, path: readonly string[]) => boolean
+  /**
+   * Official `settingsSchema.validate`: failure text, or `undefined` when valid.
+   * Missing nodes are skipped by the caller — do not invent a second validator.
+   */
+  validate: (node: unknown, draft: unknown) => string | undefined
 }
 
 /** Wrap a live settingsSchema service as plain callbacks. */
@@ -16,5 +21,33 @@ export function bindSchema(service: SchemaOps): SchemaOps {
     nodeAtPath: (root, path) => service.nodeAtPath(root, path),
     getPath: (value, path) => service.getPath(value, path),
     hasPath: (value, path) => service.hasPath(value, path),
+    validate: (node, draft) => service.validate(node, draft),
   }
 }
+
+/**
+ * Pre-mutate schema check used by the settings page.
+ * A returned string means do not call `settings.mutate`.
+ */
+export function validateSaveDraft(
+  schema: SchemaOps,
+  root: unknown,
+  settingsPath: readonly string[],
+  afterModels: unknown,
+  afterCompat: unknown,
+  willWriteCompat: boolean,
+): string | undefined {
+  const modelsNode = schema.nodeAtPath(root, [...settingsPath, 'models'])
+  if (modelsNode !== undefined) {
+    const error = schema.validate(modelsNode, afterModels)
+    if (error !== undefined) return error
+  }
+  if (willWriteCompat) {
+    const compatNode = schema.nodeAtPath(root, [...settingsPath, 'compat'])
+    if (compatNode !== undefined) {
+      const error = schema.validate(compatNode, afterCompat)
+      if (error !== undefined) return error
+    }
+  }
+  return undefined
+}

package/src/core/README.en.md

@@ -9,7 +9,7 @@
 
 Domain logic for the plugin: no React, no Cordis service instances. The settings page and Vitest both depend on these pure functions, so effort semantics can regress without booting DSH.
 
-Canonical level names and `thinkingFormat` values follow `@deepseek-ai/dsh-llm-pi-ai` (0.1.0-rc.8). A fallback whitelist is pinned by tests so the UI cannot silently drift from the upstream schema.
+Canonical level names and `thinkingFormat` values follow `@deepseek-ai/dsh-llm-pi-ai` (0.1.0-rc.8). A whitelist is pinned by tests; UI choices come only from the live schema union.
 
 ## What's in this directory
 

package/src/core/README.md

@@ -9,7 +9,7 @@
 
 本插件的领域逻辑：无 React、无 Cordis 服务实例。设置页与 Vitest 都只依赖这些纯函数，因此档位语义可以在不启动 DSH 的情况下回归。
 
-规范键名与 `thinkingFormat` 取值对齐 `@deepseek-ai/dsh-llm-pi-ai`（0.1.0-rc.8）。仓库内有回退白名单，并由测试钉住，避免 UI 与上游 schema 静默分叉。
+规范键名与 `thinkingFormat` 取值对齐 `@deepseek-ai/dsh-llm-pi-ai`（0.1.0-rc.8）。仓库内有测试钉白名单；UI 可选项只来自现场 schema union。
 
 ## 这个目录里有什么
 

package/src/core/catalog.ts

@@ -3,9 +3,9 @@
  *
  * Levels match `@deepseek-ai/dsh-llm-pi-ai` catalog.ts `THINKING_LEVELS`.
  * Formats match `SUPPORTED_THINKING_FORMATS` in the same file (rc.8).
- * Runtime UI prefers the live settings schema union; these lists are the
- * fallback plus a test pin so a silent drift is a failing test, not a
- * second hand-maintained copy nobody notices.
+ * Tests pin these lists against llm-pi-ai. The settings page never offers
+ * the handwritten thinkingFormat list as writable choices — only the live
+ * schema union, plus a stored value that the union omitted.
  */
 
 /** Selectable reasoning levels, in pi-ai escalation order. */
@@ -28,7 +28,7 @@ export const THINKING_LEVELS_WITHOUT_OFF = THINKING_LEVELS.filter(
 
 /**
  * openai-completions thinkingFormat values from llm-pi-ai catalog.ts rc.8.
- * Tests pin this list; the settings page prefers schema union choices.
+ * Test pin only — not a writable UI fallback.
  */
 export const FALLBACK_THINKING_FORMATS = [
   'openai',