dsh-plugin-effort-declare 0.1.0 → 0.1.2

package/lib/types/core/drafts.d.ts

@@ -13,6 +13,10 @@ export interface RouteDraft {
     /** Whether `compat` is present on the user profile (not the effective view). */
     compatPresent: boolean;
 }
+/** JSON-stable equality matching pathOps (key order included). */
+export declare function sliceEqual(left: unknown, right: unknown): boolean;
+/** Whether two settings slices differ. */
+export declare function sliceChanged(before: unknown, after: unknown): boolean;
 /** Build a draft from the stored user subtree (never from effective `value`). */
 export declare function routeDraftFromUserProfile(args: {
     provider: string;
@@ -31,8 +35,36 @@ export declare function applySaveSuccess(drafts: readonly RouteDraft[], savedPro
     revision: number;
 }): RouteDraft[];
 /**
- * Apply a freshly loaded table. Dirty cards keep models/compat; originals and
- * revision follow the incoming snapshot so a later save is against the new user layer.
+ * Membership follows the latest user-layer models list (Models page add/delete).
+ * Local unsaved `reasoningEfforts` (including a cleared key) overlay by id.
+ */
+export declare function mergeModelsById(args: {
+    prevModels: readonly Record<string, unknown>[];
+    prevOriginal: readonly Record<string, unknown>[];
+    incomingModels: readonly Record<string, unknown>[];
+    incomingOriginal: readonly Record<string, unknown>[];
+}): {
+    models: Record<string, unknown>[];
+    conflicted: boolean;
+};
+/**
+ * Three-way compat merge: locally changed keys stay local; everything else
+ * follows incoming. Conflict only when a locally dirty key also moved in originals.
+ */
+export declare function mergeCompat(args: {
+    prev: Record<string, unknown>;
+    prevOriginal: Record<string, unknown>;
+    incoming: Record<string, unknown>;
+    incomingOriginal: Record<string, unknown>;
+}): {
+    compat: Record<string, unknown>;
+    conflicted: boolean;
+};
+/**
+ * Apply a freshly loaded table. Membership and metadata follow incoming;
+ * unsaved reasoningEfforts / dirty compat keys overlay by id. Conflict only
+ * when a locally dirty field also changed in originals (revision-only bumps
+ * and sibling-card saves do not warn).
  */
 export declare function mergeLoadedDrafts(current: readonly RouteDraft[], incoming: readonly RouteDraft[], options: {
     preserveDirty: boolean;

package/lib/types/core/drafts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../../src/core/drafts.ts"],"names":[],"mappings":"AAQA,iEAAiE;AACjE,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,0EAA0E;IAC1E,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACjC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACzC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,gFAAgF;IAChF,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,iFAAiF;AACjF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,UAAU,CAgBb;AAED,wEAAwE;AACxE,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAQrD;AAED,+EAA+E;AAC/E,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAOxD;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,UAAU,EAAE,EAC7B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACzC,UAAU,EAAE,CAcd;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,QAAQ,EAAE,SAAS,UAAU,EAAE,EAC/B,OAAO,EAAE;IAAE,aAAa,EAAE,OAAO,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBhD;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAGlE;AAED,6DAA6D;AAC7D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAE5F;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAK5F"}
+{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../../src/core/drafts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-effort-declare",
   "description": "Settings page to declare per-model reasoningEfforts and openai-completions compat on hand-declared llm-pi-ai routes. Writes the official namespace; does not intercept llm/stream or replace the Models page.",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/client/EffortDeclareSection.tsx

@@ -31,17 +31,16 @@ 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'
 
-export type InvalidationSource = 'settings' | 'directory'
+export type InvalidationSource = 'settings' | 'directory' | 'writable'
 
 export interface EffortDeclareSectionInjected {
   api: Pick<IApiClient, 'settings' | 'llm'>
   describe: SettingsDescribeFace
   schema: SchemaOps
-  t: (key: EffortDeclareKey) => string
   subscribeInvalidate: (listener: (source: InvalidationSource) => void) => () => void
 }
 
@@ -166,18 +165,20 @@ function RouteCard(props: {
   draft: RouteDraft
   formats: readonly string[]
   writable: boolean
+  /** This card is the in-flight mutate — show “Saving…”. */
   busy: boolean
-  reloading: boolean
+  /** Namespace-level lock: any mutate, read-only, or first load. */
+  saveLocked: boolean
   notice: CardNotice | undefined
   t: (key: EffortDeclareKey) => string
   onChange: (draft: RouteDraft) => void
   onSave: (draft: RouteDraft) => void
   onCancel: (draft: RouteDraft) => void
 }): ReactNode {
-  const { draft, writable, busy, reloading, t, onChange } = props
+  const { draft, writable, busy, saveLocked, t, onChange } = props
   const noModels = draft.models.length === 0
   const editDisabled = !writable || busy || noModels
-  const saveLocked = editDisabled || reloading
+  const saveDisabled = saveLocked || noModels
   const formats = thinkingFormatChoices(props.formats, draft.compat.thinkingFormat)
   const summary = compatSummary(draft.compat)
   const sameWire = draft.compat.supportsReasoningEffort === false
@@ -303,7 +304,7 @@ function RouteCard(props: {
         <button
           type="button"
           className={css.primaryButton}
-          disabled={saveLocked || !dirty || clientError !== undefined}
+          disabled={saveDisabled || !dirty || clientError !== undefined}
           onClick={() => { props.onSave(draft) }}
         >
           {busy ? t('saving') : t('save')}
@@ -336,12 +337,12 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
       return
     }
     const generation = nextGeneration(generationRef)
-    setStatus('loading')
+    if (draftsRef.current.length === 0) setStatus('loading')
     setError('')
     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 +351,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 +371,40 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
 
   useEffect(() => {
     if (props.subscribeInvalidate === undefined) return undefined
-    return props.subscribeInvalidate(() => { reload(true) })
-  }, [props.subscribeInvalidate, reload])
+    return props.subscribeInvalidate((source) => {
+      if (source === 'writable') {
+        const view = describe?.getSnapshot().view
+        if (view !== undefined) setWritable(view.writable)
+        return
+      }
+      if (source === 'settings' || source === 'directory') reload(true)
+    })
+  }, [describe, 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 (status === 'loading' || busyRoute !== null) return
+    if (api === undefined || describe === undefined || schema === undefined) return
+    if (status === 'loading' || busyRoute !== null) {
+      patchNotice(draft.provider, { kind: 'error', text: t('saveBusy') })
+      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 +417,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 +463,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 +477,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 +489,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>
         )
@@ -460,24 +512,16 @@ export function EffortDeclareSection(props: EffortDeclareSectionProps): ReactNod
                 formats={formats.length > 0 ? formats : []}
                 writable={writable}
                 busy={busyRoute === draft.provider}
-                reloading={status === 'loading'}
+                saveLocked={!writable || busyRoute !== null || status === 'loading'}
                 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`. |
-| [`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`. |
+| [`index.ts`](./index.ts) | Registers zh/en copy, CSS (`ctx.effect` insert/remove), and `settings.section` (id `effort-declare`, order 12). `describe.subscribe` only syncs `writable` (it fires for every namespace, including this page’s own `acceptView`). Full reloads come from `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. Save is exclusive for the whole `llm-pi-ai` namespace; `busy` is “Saving…” on the in-flight card, `saveLocked` disables the others. A successful write folds `acceptView` + `applySaveSuccess` and does not full-reload. |
+| [`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`。 |
-| [`EffortDeclareSection.tsx`](./EffortDeclareSection.tsx) | 路由卡片、预设、Off 三态、高级协议开关、保存与取消。 |
-| [`load-drafts.ts`](./load-drafts.ts) | 从 `llm.providers` + 镜像组装草稿；草稿取自 `user`，协议分类可用 `value`。 |
+| [`index.ts`](./index.ts) | 注册 zh/en 文案、CSS（`ctx.effect` 插入/移除）与 `settings.section`（id `effort-declare`，order 12）。`describe.subscribe` 只同步 `writable`（任意 namespace 都会触发，含自己的 `acceptView`）。真正重载来自 `settings/document-updated`（仅 `llm-pi-ai`）、`llm/adapters-updated`、`connection/reset`。`locale: NS` 由框架注入 `t`，inject 只传 `api` / `describe` / `schema` / `subscribeInvalidate`。 |
+| [`EffortDeclareSection.tsx`](./EffortDeclareSection.tsx) | 路由卡片、预设、Off 三态、高级协议开关、保存与取消。保存互斥到整个 `llm-pi-ai` namespace；`busy` 只给正在 mutate 的卡显示「保存中」，其它卡 `saveLocked`。自己写入成功走 `acceptView` + `applySaveSuccess`，不再全量 reload。 |
+| [`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>()
 
@@ -62,7 +66,11 @@ export function apply(ctx: ClientContext): void {
     const emit = (source: InvalidationSource) => {
       for (const listener of invalidation) listener(source)
     }
+    // Mirror subscribe fires on every namespace (theme, locale, own acceptView).
+    // Only fold writable from that; llm-pi-ai document changes come from the
+    // Host event below so a dirty card is not treated as a conflict.
     const disposers = [
+      describe.subscribe(() => { emit('writable') }),
       ctx.remote.$on('settings/document-updated', (ns: string) => {
         if (ns !== LLM_PI_AI_NS) return
         emit('settings')
@@ -83,14 +91,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

@@ -13,6 +13,7 @@ export type EffortDeclareKey =
   | 'readOnly'
   | 'save'
   | 'saving'
+  | 'saveBusy'
   | 'cancel'
   | 'saved'
   | 'conflict'
@@ -57,6 +58,7 @@ export const zh: Record<EffortDeclareKey, string> = {
   readOnly: '当前设置为只读，无法保存。',
   save: '保存',
   saving: '保存中…',
+  saveBusy: '另有路由正在保存，请稍候。',
   cancel: '取消',
   saved: '已保存。对话选择器会按新的能力声明显示 Effort 行。',
   conflict: '设置已被其他地方改过，请重新加载后再保存。',
@@ -77,7 +79,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，取消勾选会删除该键。',
@@ -100,6 +102,7 @@ export const en: Record<EffortDeclareKey, string> = {
   readOnly: 'Settings are read-only; saving is disabled.',
   save: 'Save',
   saving: 'Saving…',
+  saveBusy: 'Another route is saving. Wait, then save this card.',
   cancel: 'Cancel',
   saved: 'Saved. The composer Effort row follows this capability declaration.',
   conflict: 'Settings changed elsewhere. Reload, then save again.',
@@ -120,7 +123,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; 0.1.1-rc.2 uses the same level set). `thinkingFormat` is pinned to the live-schema snapshot in [`tests/fixtures/pi-ai-thinking-format-union.ts`](../../tests/fixtures/pi-ai-thinking-format-union.ts); effort keys stay a locally pinned whitelist. UI choices come only from the live schema union.
 
 ## What's in this directory
 
@@ -19,7 +19,7 @@ Canonical level names and `thinkingFormat` values follow `@deepseek-ai/dsh-llm-p
 | [`efforts.ts`](./efforts.ts) | `reasoningEfforts` read/write, Off tri-state, validation (empty object / Off-only / unknown keys return an error code, never throw). |
 | [`presets.ts`](./presets.ts) | DeepSeek, OpenAI, and on/off presets; each states all three dialect keys; spread onto existing model rows and route `compat`. |
 | [`path-ops.ts`](./path-ops.ts) | Same one-level key diff as the official Models page; `buildSaveOps` uses `settingsPath` and only submits that route’s full `models` table and dirty `compat` keys. |
-| [`drafts.ts`](./drafts.ts) | User-layer drafts, dirty aligned with pathOps, post-save revision bump, dirty merge, generation. |
+| [`drafts.ts`](./drafts.ts) | User-layer drafts, dirty aligned with pathOps, post-save revision. On refresh, latest user-layer model membership wins; unsaved `reasoningEfforts` (including a cleared key) overlay by id; `compat` is a per-key 3-way merge. Conflict only when a locally dirty field also moved in originals (revision-only bumps and sibling-card saves do not warn). |
 | [`paths.ts`](./paths.ts) | Nested reads; clones of objects and model tables (non-object rows skipped). |
 | [`filter.ts`](./filter.ts) | Which routes are editable: hand-declared `llm-pi-ai` + openai-completions; skip catalog and official DeepSeek. |
 | [`validate.ts`](./validate.ts) | Per-row `reasoningEfforts` validation. |

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；0.1.1-rc.2 档位集合相同）。`thinkingFormat` 由 [`tests/fixtures/pi-ai-thinking-format-union.ts`](../../tests/fixtures/pi-ai-thinking-format-union.ts) 钉现场 schema；档位键由测试钉本地白名单。UI 可选项只来自现场 schema union。
 
 ## 这个目录里有什么
 
@@ -19,7 +19,7 @@
 | [`efforts.ts`](./efforts.ts) | `reasoningEfforts` 读写、Off 三态、校验（空对象 / 只开 Off / 未知键返回错误码，不抛异常）。 |
 | [`presets.ts`](./presets.ts) | DeepSeek、OpenAI、仅开/关三套预设；每套对三个方言键都表态；spread 到已有模型行与路由 `compat`。 |
 | [`path-ops.ts`](./path-ops.ts) | 与官方模型页相同的一层键 diff；`buildSaveOps` 使用 `settingsPath`，只提交该路由的 `models` 整表和有差异的 `compat` 键。 |
-| [`drafts.ts`](./drafts.ts) | 用户层草稿、dirty 与 pathOps 一致、保存后 revision、脏卡合并、generation。 |
+| [`drafts.ts`](./drafts.ts) | 用户层草稿、dirty 与 pathOps 一致、保存后 revision。刷新时以最新用户层模型名单为成员真理，按 id 贴回未保存的 `reasoningEfforts`（含已清除=删键）；`compat` 按键三路合并。冲突仅当本地脏字段的 originals 也变了（只 bump revision 或别的卡保存不报）。 |
 | [`paths.ts`](./paths.ts) | 嵌套读取、对象与模型表的 clone（非对象行跳过）。 |
 | [`filter.ts`](./filter.ts) | 哪些路由可编辑：手工 `llm-pi-ai` + openai-completions；排除 catalog 与官方 DeepSeek。 |
 | [`validate.ts`](./validate.ts) | 对单行 `reasoningEfforts` 调用校验。 |

package/src/core/catalog.ts

@@ -3,9 +3,11 @@
  *
  * 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 a checked-in schema fixture
+ * (`tests/fixtures/pi-ai-thinking-format-union.ts`) and the local level
+ * whitelist. 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 +30,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',