@fonlan/dsh-model-parameters 0.1.4 → 0.1.6

package/src/client/{settings-card.css → settings-section.css}

@@ -1,98 +1,43 @@
 /**
- * Styles for the Model Parameters Settings Card (设置 → 插件 → 插件配置).
+ * Styles for the Model Parameters settings page.
  *
- * The expandable chrome mirrors the built-in plugin cards
- * (dsh-client-ui-settings-plugins PluginCard.module.css): external plugins
- * cannot import PluginCard, so the shell/head/chevron/body are re-drawn with
- * the same tokens and geometry. Inner controls follow the built-in cards'
- * field language (ValueField): border-l2 inputs on bg-layer-3, inverted
- * primary buttons, divider-separated groups.
+ * The page occupies the settings panel's content column: a header (title plus
+ * a one-line summary) over divider-separated control groups. Inner controls
+ * follow the built-in settings language: border-l2 inputs on bg-layer-3,
+ * inverted primary buttons.
  */
 
-/* ── card chrome (aligned with the built-in PluginCard) ─────────────────── */
+/* page layout */
 
-.mp-card {
-  border: 1px solid var(--dsw-alias-border-l2, #2a3346);
-  background: var(--dsw-alias-bg-layer-3, #0d1017);
-  border-radius: 12px;
-  list-style: none;
-  transition: border-color .16s, background .16s;
-}
-
-.mp-card:hover {
-  border-color: var(--dsw-alias-label-dimmed, #4a5468);
-}
-
-.mp-card[data-open] {
-  background: var(--dsw-alias-bg-layer-2, #141a26);
-  border-color: var(--dsw-alias-label-dimmed, #4a5468);
-}
-
-.mp-card-head {
-  appearance: none;
-  width: 100%;
-  font: inherit;
-  color: inherit;
-  text-align: left;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  border-radius: 12px;
-  align-items: center;
-  gap: 12px;
-  padding: 14px 16px;
+.mp-page {
   display: flex;
+  flex-direction: column;
+  gap: 16px;
+  max-width: 720px;
 }
 
-.mp-card-head:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary, #4f8cff);
-  outline-offset: -2px;
-}
-
-.mp-card-headText {
-  flex-direction: column;
-  flex: 1;
-  gap: 4px;
-  min-width: 0;
+.mp-page-head {
   display: flex;
+  flex-direction: column;
+  gap: 6px;
 }
 
-.mp-card-title {
+.mp-page-title {
+  margin: 0;
   color: var(--dsw-alias-label-primary, #e6e6e6);
   font-size: 15px;
   font-weight: 600;
   line-height: 1.4;
 }
 
-.mp-card-sub {
+.mp-page-sub {
+  margin: 0;
   color: var(--dsw-alias-label-tertiary, #8b93a7);
   font-size: 13px;
   line-height: 1.5;
 }
 
-.mp-card-chevron {
-  color: var(--dsw-alias-label-tertiary, #8b93a7);
-  flex: none;
-  transition: transform .16s;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.mp-card-chevron[data-open] {
-  transform: rotate(180deg);
-}
-
-.mp-card-body {
-  border-top: 1px solid var(--dsw-alias-border-l2, #2a3346);
-  margin: 0 16px;
-  padding: 12px 0 8px;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-/* ── body layout ────────────────────────────────────────────────────────── */
+/* body layout */
 
 .mp-body {
   display: flex;
@@ -141,7 +86,7 @@
   line-height: 1.6;
 }
 
-/* ── toggles ────────────────────────────────────────────────────────────── */
+/* toggles */
 
 .mp-toggle {
   display: flex;
@@ -177,7 +122,7 @@
   line-height: 1.5;
 }
 
-/* ── catalog meta / ttl ─────────────────────────────────────────────────── */
+/* catalog meta / ttl */
 
 .mp-meta {
   display: flex;
@@ -198,7 +143,7 @@
   line-height: 1.6;
 }
 
-/* ── inputs (ValueField language) ───────────────────────────────────────── */
+/* inputs */
 
 .mp-input {
   border: 1px solid var(--dsw-alias-border-l2, #2a3346);
@@ -226,7 +171,7 @@
   width: 72px;
 }
 
-/* ── mapping rows ───────────────────────────────────────────────────────── */
+/* mapping rows */
 
 .mp-map-row {
   display: flex;
@@ -244,7 +189,7 @@
   flex: none;
 }
 
-/* ── buttons (PluginCard footer language) ────────────────────────────────── */
+/* buttons */
 
 .mp-actions {
   display: flex;
@@ -291,7 +236,7 @@
   border-color: var(--dsw-alias-label-dimmed, #4a5468);
 }
 
-/* ── report / badges / code ─────────────────────────────────────────────── */
+/* report / badges / code */
 
 .mp-report {
   margin: 0;

package/src/client/{settings-card.tsx → settings-section.tsx}

@@ -1,18 +1,15 @@
 /**
- * The Model Parameters Settings Card: master + per-field toggles, catalog TTL,
- * provider→models.dev mapping overrides, a manual refresh/fill action, the
- * catalog freshness line, and the last fill report (filled / touched /
- * unmatched).
+ * The Model Parameters settings page (设置 → 侧栏「模型参数补全」).
  *
- * The card registers into the `settings.plugin.item` slot keyed by the
- * `model-parameters` settings namespace, so it renders inside
- * 设置 → 插件 → 插件配置, stacked with the built-in plugin cards. The chrome is
- * self-drawn (external plugins cannot import the built-in PluginCard) with
- * styles aligned to it: an expandable header (collapsed by default) and a body
- * that discloses the controls in place.
+ * Registers into the `settings.section` slot, so the page owns one entry in
+ * the settings sidebar and renders its content in the panel's content column.
+ * Content: master + per-field toggles, catalog TTL, provider→models.dev
+ * mapping overrides, a manual refresh/fill action, the catalog freshness line,
+ * and the last fill report (filled / touched / unmatched).
  *
  * All reads/mutations go through the plugin's fenced API; config persists into
- * the `model-parameters` settings namespace (settings.yaml).
+ * the `model-parameters` profile entry — the plugin's own loader entry config,
+ * written through the host settings service.
  */
 import { useCallback, useEffect, useState, useSyncExternalStore } from 'react'
 import type { Context } from '@deepseek-ai/cordis'
@@ -21,7 +18,7 @@ import type { Translate } from '@deepseek-ai/dsh-client-ui-slots'
 import { LOCALE_NS } from './locales'
 import { api, type PluginState } from './api'
 import type { ModelParametersConfig } from '../shared/config.js'
-import './settings-card.css'
+import './settings-section.css'
 
 function useLocaleRevision(ctx: ClientContext): number {
   const subscribe = useCallback(
@@ -52,7 +49,7 @@ function formatTime(epochMs: number): string {
   }
 }
 
-export function makeSettingsCard(ctx: ClientContext): () => JSX.Element {
+export function makeSettingsSection(ctx: ClientContext): () => JSX.Element {
   const t: Translate = (() => {
     try {
       return ctx.locale.bind(LOCALE_NS) as unknown as Translate
@@ -61,10 +58,8 @@ export function makeSettingsCard(ctx: ClientContext): () => JSX.Element {
     }
   })()
 
-  return function ModelParametersCard(): JSX.Element {
+  return function ModelParametersSettingsSection(): JSX.Element {
     useLocaleRevision(ctx)
-    // Card-local disclosure: collapsed by default, like the built-in plugin cards.
-    const [open, setOpen] = useState(false)
     const [state, setState] = useState<PluginState | null>(null)
     const [error, setError] = useState<string | null>(null)
     const [loading, setLoading] = useState(true)
@@ -140,58 +135,42 @@ export function makeSettingsCard(ctx: ClientContext): () => JSX.Element {
       await patchConfig({ providerMap })
     }, [mappingRows, patchConfig])
 
-    const title = t('settingsTitle')
-
     return (
-      <li className="mp-card" data-open={open ? '' : undefined}>
-        <button type="button" className="mp-card-head" aria-expanded={open}
-          aria-label={(open ? t('collapse') : t('expand')) + '：' + title}
-          onClick={() => setOpen(!open)}>
-          <span className="mp-card-headText">
-            <span className="mp-card-title">{title}</span>
-            <span className="mp-card-sub">{t('cardSub')}</span>
-          </span>
-          <span className="mp-card-chevron" data-open={open ? '' : undefined} aria-hidden="true">
-            <svg width="14" height="14" viewBox="0 0 14 14" fill="none">
-              <path d="M3.5 5.25L7 8.75L10.5 5.25" stroke="currentColor" strokeWidth="1.5"
-                strokeLinecap="round" strokeLinejoin="round" />
-            </svg>
-          </span>
-        </button>
-        {open && (
-          <div className="mp-card-body">
-            {error !== null && state === null ? (
-              <p className="mp-error">{t('error')}: {error}</p>
-            ) : loading || state === null ? (
-              <p className="mp-muted">{t('saving')}</p>
-            ) : (
-              <ModelParametersCardBody
-                t={t}
-                state={state}
-                error={error}
-                saving={saving}
-                busy={busy}
-                mappingRows={mappingRows}
-                newFrom={newFrom}
-                newTo={newTo}
-                setNewFrom={setNewFrom}
-                setNewTo={setNewTo}
-                setMappingRows={setMappingRows}
-                onPatchConfig={patchConfig}
-                onRefresh={refresh}
-                onReconcile={reconcileNow}
-                onApplyMappings={applyMappings}
-              />
-            )}
-          </div>
+      <div className="mp-page">
+        <header className="mp-page-head">
+          <h3 className="mp-page-title">{t('settingsTitle')}</h3>
+          <p className="mp-page-sub">{t('sectionSub')}</p>
+        </header>
+        {error !== null && state === null ? (
+          <p className="mp-error">{t('error')}: {error}</p>
+        ) : loading || state === null ? (
+          <p className="mp-muted">{t('saving')}</p>
+        ) : (
+          <ModelParametersBody
+            t={t}
+            state={state}
+            error={error}
+            saving={saving}
+            busy={busy}
+            mappingRows={mappingRows}
+            newFrom={newFrom}
+            newTo={newTo}
+            setNewFrom={setNewFrom}
+            setNewTo={setNewTo}
+            setMappingRows={setMappingRows}
+            onPatchConfig={patchConfig}
+            onRefresh={refresh}
+            onReconcile={reconcileNow}
+            onApplyMappings={applyMappings}
+          />
         )}
-      </li>
+      </div>
     )
   }
 }
 
-/** The card body: divider-separated control groups, styled like the built-in cards. */
-function ModelParametersCardBody(props: {
+/** The page body: divider-separated control groups. */
+function ModelParametersBody(props: {
   t: Translate
   state: PluginState
   error: string | null

package/src/index.ts

@@ -6,11 +6,11 @@
  * tokens / reasoning efforts / input modalities (the norm for a freshly
  * synced gateway), it fills the missing fields from a cached models.dev
  * catalog (TTL-refreshed), and serves the fenced JSON API the web settings
- * page calls. The plugin's own toggles live in the `model-parameters`
- * settings namespace (settings.yaml).
+ * page calls. The plugin's own toggles are its loader entry config (the
+ * `model-parameters` profile entry, schema {@link Config}).
  */
 import type { Context } from '@deepseek-ai/cordis'
-import { Config } from './shared/config.js'
+import { Config, type ModelParametersLiveConfig } from './shared/config.js'
 import { ModelParametersService } from './server/service.js'
 import { registerApiRoutes } from './server/rpc.js'
 import {
@@ -32,8 +32,8 @@ export { Config }
 export { CatalogManager, acceptedInputModalities, identityReasoningEfforts }
 export type { CatalogEntry, CatalogSnapshot }
 
-export function apply(ctx: Context): void {
-  const service = new ModelParametersService(ctx)
+export function apply(ctx: Context, config: ModelParametersLiveConfig = {}): void {
+  const service = new ModelParametersService(ctx, config)
 
   ctx.effect(() => {
     service.start()

package/src/server/service.ts

@@ -1,26 +1,26 @@
 /**
- * The model-parameters service: owns the plugin settings namespace, watches
- * the `llm-pi-ai` namespace for provider model writes, reconciles missing
- * fields from the cached models.dev catalog, and tracks a fill report.
+ * The model-parameters service: completes missing model fields in the
+ * `llm-pi-ai` settings namespace from the cached models.dev catalog and tracks
+ * a fill report. Its own settings ARE this plugin's loader entry config (see
+ * shared/config.ts), so there is no per-plugin settings scope to own here.
  *
  * Trigger model:
  *  - any committed `llm-pi-ai` settings change (settings UI apply, manual
- *    settings.yaml edit published by the file provider, model-router-style
- *    external writes) runs a reconcile;
+ *    profile-patch edit, model-router-style external writes) runs a reconcile;
  *  - plugin start runs a backfill reconcile over the existing configuration.
  * Reconcile is fill-only: it never overwrites a present field, and it writes
  * nothing when nothing is missing — so its own writes cannot re-trigger a
  * second patch (the next event sees the fields present and produces no ops).
  */
 import type { Context } from '@deepseek-ai/cordis'
-import type { SettingsScope, SettingsPathOp } from '@deepseek-ai/dsh-settings'
+import type { SettingsPathOp } from '@deepseek-ai/dsh-settings'
 import type { PiAiModelProfile } from '@deepseek-ai/dsh-llm-pi-ai'
 import {
-  Config,
-  DEFAULT_CONFIG,
   PLUGIN_NS,
   TARGET_NS,
+  readConfig,
   type ModelParametersConfig,
+  type ModelParametersLiveConfig,
 } from '../shared/config.js'
 import {
   CatalogManager,
@@ -53,56 +53,66 @@ export class ModelParametersService {
    * a sibling fiber. The injected child ctx itself is only valid while its
    * fiber is active — the provider can be reloaded (and every dependent
    * fiber torn down) while an async reconcile is in flight — so all reads
-   * and writes go through the captured service value, which is a plain
-   * object and never walks the fiber chain.
+   * and writes of the `llm-pi-ai` namespace go through the captured service
+   * value, which is a plain object and never walks the fiber chain.
    */
   private settings: Context['settings'] | undefined
-  private scope: SettingsScope<ModelParametersConfig> | undefined
   private lastReport: FillReport | null = null
   private readonly catalog: CatalogManager
   private reconciling: Promise<void> | null = null
 
-  constructor(private readonly ctx: Context) {
+  /**
+   * @param ctx the plugin context.
+   * @param entryConfig this plugin's own live entry config (the profile entry
+   *   `model-parameters`): the resolved `Config` document, whose `.volatile()`
+   *   fields are live cells that the loader swaps in place on every settings
+   *   write. Read through {@link readConfig} on each access, never cached.
+   */
+  constructor(
+    private readonly ctx: Context,
+    private readonly entryConfig: ModelParametersLiveConfig | undefined,
+  ) {
     this.catalog = new CatalogManager(ctx.logger)
   }
 
   start(): void {
-    // Own settings namespace (config toggles, TTL, provider map). The inject
-    // callback fires asynchronously once the settings service is available, so
-    // the first-run backfill reconcile lives INSIDE it — reconcile needs the
+    // The plugin's own settings ARE this entry config, so nothing is
+    // registered here: `config()` projects the live entry config and writes
+    // go through the settings service (see updateConfig). The inject callback
+    // fires asynchronously once the settings service is available, so the
+    // first-run backfill reconcile lives INSIDE it — reconcile needs the
     // settings service (to read the target namespace and persist fills).
     this.ctx.inject(['settings'], (sctx) => {
       this.settings = sctx.settings
-      this.scope = this.settings.register(OWN, Config) as SettingsScope<ModelParametersConfig>
       // First-run backfill: ensure a fresh-enough catalog, then fill existing
       // models. Never blocks plugin startup.
       void this.reconcile()
     })
 
     // Watch the target namespace: any committed provider-model change may
-    // leave fields missing -> reconcile.
-    this.ctx.on('settings/updated', (ns) => {
+    // leave fields missing -> reconcile. `settings/document-updated` is the
+    // committed-change signal (dsh-settings bumps a form revision after the
+    // profile patch was written); it also fires for this plugin's own entry,
+    // which is filtered out here so a toggle write never triggers a reconcile.
+    this.ctx.on('settings/document-updated', (ns) => {
       if (ns !== TARGET) return
       void this.reconcile()
     })
   }
 
   stop(): void {
-    this.scope = undefined
     this.settings = undefined
   }
 
   // ── reads for the settings page ────────────────────────────────────────────
 
+  /**
+   * The plugin's current settings, projected from the live entry config.
+   * Works with no settings service at all (headless), which is why the plain
+   * {@link DEFAULT_CONFIG} fallback lives in {@link readConfig}.
+   */
   config(): ModelParametersConfig {
-    if (this.scope !== undefined) {
-      try {
-        return this.scope.get()
-      } catch {
-        // fall through to defaults
-      }
-    }
-    return { ...DEFAULT_CONFIG, providerMap: {}, officialProviders: [...DEFAULT_CONFIG.officialProviders] }
+    return readConfig(this.entryConfig)
   }
 
   catalogSnapshot(): CatalogSnapshot {
@@ -119,13 +129,29 @@ export class ModelParametersService {
     await this.reconcile()
   }
 
-  /** Update plugin config toggles from the settings page. */
+  /**
+   * Update the plugin's own settings from the settings page. `dsh-settings`
+   * addresses the plugin's loader entry by its id and refuses any path the
+   * `Config` schema did not mark volatile — every field here is volatile.
+   */
   async updateConfig(patch: Partial<ModelParametersConfig>): Promise<void> {
-    if (this.scope === undefined) {
+    const settings = this.settings
+    if (settings === undefined) {
       throw new Error('model-parameters: settings service is not available in this profile')
     }
-    const current = this.config()
-    await this.scope.update({ ...current, ...patch })
+    // `update` MERGES the patch into the entry's stored section — the
+    // "merge a partial into the current config" contract the page has always
+    // used. `providerMap` is the one plain OBJECT the page re-sends whole (a
+    // removed mapping row must disappear), and a deep merge would resurrect
+    // the removed key, so that field rides a path `set` op instead: `mutate`
+    // delegates to the same `write()` and replaces the value at the path
+    // wholesale. Arrays (`officialProviders`) are replaced by the merge
+    // itself, since the merge only recurses into plain objects.
+    const { providerMap, ...rest } = patch
+    if (Object.keys(rest).length > 0) await settings.update(OWN, rest)
+    if (providerMap !== undefined) {
+      await settings.mutate(OWN, [{ op: 'set', path: ['providerMap'], value: providerMap }])
+    }
   }
 
   // ── reconcile ──────────────────────────────────────────────────────────────
@@ -158,7 +184,7 @@ export class ModelParametersService {
     // Operate on the RAW user section (descriptor.user), not the resolved
     // value: the resolved section is schema-normalized (pi-ai's loose object
     // resolution adds empty `input`/`compat` defaults), and persisting that
-    // shape would leak schema-default noise into settings.yaml. The raw
+    // shape would leak schema-default noise into the profile patch. The raw
     // section is exactly what the user document stores.
     const descriptor = settings.describe({ redactSecrets: false }).find((candidate) => candidate.ns === TARGET)
     const section = descriptor?.user as { providers?: Record<string, { models?: PiAiModelProfile[] }> } | undefined