@dsh-plus/llm-pi 0.1.27 → 0.1.28

package/src/client/card.tsx

@@ -18,6 +18,7 @@ import {
 } from '@dsh-plus/shared/client'
 import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 import { type ConfigValue, fetchCatalog, refreshCatalog, type WireModelsDevStatus } from './api.ts'
+import { installCompatFields } from './constants.ts'
 import {
   type Draft,
   draftFromValue,
@@ -65,6 +66,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
   }, [value, draft])
 
   // 运行期诊断行（kitSource / models-dev 状态）来自模型目录端点，非配置数据。
+  // compat 字段表同批下发：安装后 UI 渲染与服务端校验同源（不再手抄镜像表）。
   useEffect(() => {
     let alive = true
     fetchCatalog('', 'models-dev')
@@ -72,6 +74,7 @@ export function LlmPiCard(props: CardProps): ReactElement | null {
         if (!alive) return
         setKitSource(result.kitSource ?? null)
         setModelsDevStatus(result.status ?? null)
+        if (result.compat !== undefined) installCompatFields(result.compat.fields)
       })
       .catch(() => {})
     return () => {

package/src/client/constants.ts

@@ -27,69 +27,29 @@ export const TRANSPORT_OPTIONS = ['sse', 'websocket', 'websocket-cached', 'auto'
 /** thinkingBudgets 档位键（来源：config.ts thinkingBudgets）。 */
 export const BUDGET_KEYS = ['minimal', 'low', 'medium', 'high'] as const
 
-type CompatValue = 'boolean' | 'object' | readonly string[]
+export type CompatValue = 'boolean' | 'integer' | 'number' | 'object' | readonly string[]
 
 /**
- * 逐协议 compat 字段表（来源：compat.ts，逐字段镜像官方 catalog.ts COMPAT_GATES）。
- * 只列 offer 字段（withhold 字段官方写时拒绝，UI 不提供）；取值约束对齐官方
- * config.ts compatProfile schema。
+ * 逐协议 compat 字段表：**服务端推导结果经 /catalog 下发**，浏览器半不再手抄
+ * （手抄遗漏官方新增字段 = UI 不渲染 + 保存被后端拒绝；见 compat-gates.ts）。
+ * 未拿到服务端表时用 EMPTY（UI 只渲染提示行），不放内置副本兜底——宁可少画
+ * 控件，也不给出可能与官方不符的字段集。
  */
-const COMPAT_FIELDS: Record<string, Record<string, CompatValue>> = {
-  'openai-completions': {
-    supportsStore: 'boolean',
-    supportsDeveloperRole: 'boolean',
-    supportsReasoningEffort: 'boolean',
-    supportsUsageInStreaming: 'boolean',
-    supportsFinishReason: 'boolean',
-    maxTokensField: ['max_completion_tokens', 'max_tokens'],
-    requiresToolResultName: 'boolean',
-    requiresAssistantAfterToolResult: 'boolean',
-    requiresThinkingAsText: 'boolean',
-    requiresReasoningContentOnAssistantMessages: 'boolean',
-    thinkingFormat: [
-      'openai',
-      'deepseek',
-      'openrouter',
-      'together',
-      'baseten',
-      'zai',
-      'qwen',
-      'chat-template',
-      'qwen-chat-template',
-      'string-thinking',
-      'ant-ling',
-    ],
-    chatTemplateKwargs: 'object',
-    chatTemplateArgs: 'object',
-    supportsThinkingTokenBudget: 'boolean',
-    supportsStrictMode: 'boolean',
-    cacheControlFormat: ['anthropic'],
-    supportsLongCacheRetention: 'boolean',
-  },
-  'openai-responses': {
-    supportsDeveloperRole: 'boolean',
-    supportsStrictMode: 'boolean',
-    supportsLongCacheRetention: 'boolean',
-  },
-  'anthropic-messages': {
-    supportsEagerToolInputStreaming: 'boolean',
-    supportsLongCacheRetention: 'boolean',
-    supportsCacheControlOnTools: 'boolean',
-    supportsTemperature: 'boolean',
-    forceAdaptiveThinking: 'boolean',
-    allowEmptySignature: 'boolean',
-    supportsStrictTools: 'boolean',
-  },
+let compatTable: Record<string, Record<string, CompatValue>> = {}
+
+/** 安装服务端下发的字段表（card 挂载/刷新目录时调用）。 */
+export function installCompatFields(table: Record<string, Record<string, CompatValue>>): void {
+  compatTable = table
 }
 
 /** 某协议的全部合法 compat 键（与服务端 compatFieldsOf 一致）。 */
 export function compatFieldsOf(api: string): readonly string[] {
-  return Object.keys(COMPAT_FIELDS[api] ?? {})
+  return Object.keys(compatTable[api] ?? {})
 }
 
 /** 某协议某字段的取值约束（与服务端 compatFieldSpec 一致）。 */
 export function compatFieldSpec(api: string, field: string): CompatValue | undefined {
-  return COMPAT_FIELDS[api]?.[field]
+  return compatTable[api]?.[field]
 }
 
 /** api 未设置时的渲染回退组（最常见的协议；保存仍由后端按实际协议校验）。 */

package/src/client/fields.tsx

@@ -84,6 +84,64 @@ export function TextField(props: TextFieldProps): ReactElement {
   )
 }
 
+export interface IntegerFieldProps {
+  id: string
+  label: string
+  hint?: string
+  invalidLabel: string
+  value: unknown
+  /** 放弃/保存后外部重置草稿时自增，驱动本地文本重新播种。 */
+  epoch: number
+  disabled?: boolean
+  wide?: boolean
+  /** 合法整数回调整数；空输入与非法输入回调 undefined。 */
+  onEdit(value: unknown): void
+}
+
+/**
+ * 整数字段：compat 的数值型开关（如 vllmPriority，官方 z.number().step(1)）。
+ * 本地保留文本态（与 JsonField 同款 epoch 播种），仅在解析为整数时回写草稿——
+ * 小数/非数字显示错误且不提交，与服务端 checkValue 的整数语义一致
+ * （后端仍做最终校验）。
+ */
+export function IntegerField(props: IntegerFieldProps): ReactElement {
+  const [text, setText] = useState(() => (props.value === undefined ? '' : String(props.value)))
+  // biome-ignore lint/correctness/useExhaustiveDependencies: 仅在 epoch 递增（外部重置语义）时同步文本，避免编辑中被 value 回写打断
+  useEffect(() => {
+    setText(props.value === undefined ? '' : String(props.value))
+  }, [props.epoch])
+  const trimmed = text.trim()
+  const parsed = trimmed === '' ? undefined : Number(trimmed)
+  const ok = trimmed === '' || (parsed !== undefined && Number.isInteger(parsed))
+  return (
+    <div className={`lpc-field${props.wide === true ? ' lpc-wide' : ''}`}>
+      <div className="lpc-head">
+        <label className="lpc-label" htmlFor={props.id}>
+          {props.label}
+        </label>
+      </div>
+      <input
+        id={props.id}
+        className={`lpc-input${ok ? '' : ' lpc-inputInvalid'}`}
+        type="text"
+        inputMode="numeric"
+        aria-invalid={ok ? undefined : true}
+        value={text}
+        disabled={props.disabled === true}
+        onChange={(event) => {
+          const next = event.target.value
+          setText(next)
+          const value = next.trim() === '' ? undefined : Number(next.trim())
+          props.onEdit(value !== undefined && Number.isInteger(value) ? value : undefined)
+        }}
+      />
+      <p className={ok ? 'lpc-hint' : 'lpc-invalid'}>
+        {ok ? (props.hint ?? '') : props.invalidLabel}
+      </p>
+    </div>
+  )
+}
+
 export interface SelectFieldProps {
   id: string
   label: string

package/src/client/i18n.ts

@@ -62,6 +62,7 @@ const ownZh = {
   retryPolicy: '重试策略（JSON）',
   retryPolicyHint: 'dsh-llm RetryPolicy 形状；非法 JSON 不会提交。',
   invalidJson: 'JSON 格式错误（该字段不会提交）。',
+  invalidInteger: '必须是整数（该字段不会提交）。',
   compatGroup: 'Compat 覆盖',
   compatApiHint: 'api 未设置时暂按 openai-completions 字段组渲染；保存时后端按实际协议校验。',
   compatUnset: '未设置',
@@ -144,6 +145,7 @@ const ownEn = {
   retryPolicy: 'Retry policy (JSON)',
   retryPolicyHint: 'dsh-llm RetryPolicy shape; invalid JSON is not submitted.',
   invalidJson: 'Invalid JSON (this field will not be submitted).',
+  invalidInteger: 'Must be an integer (this field will not be submitted).',
   compatGroup: 'Compat overrides',
   compatApiHint:
     'When api is unset, fields render per openai-completions; the backend validates per the effective protocol.',

package/src/client/views/compat.tsx

@@ -8,7 +8,7 @@
 import type { ReactElement } from 'react'
 
 import { COMPAT_FALLBACK_API, compatFieldSpec, compatFieldsOf } from '../constants.ts'
-import { CollapseSection, JsonField, SelectField } from '../fields.tsx'
+import { CollapseSection, IntegerField, JsonField, SelectField } from '../fields.tsx'
 import type { Translate } from '../i18n.ts'
 
 /** api 变更后裁剪 compat：只保留新渲染组的字段，避免保存时被后端拒绝。 */
@@ -90,6 +90,21 @@ export function CompatEditor(props: CompatEditorProps): ReactElement {
                 />
               )
             }
+            if (spec === 'integer' || spec === 'number') {
+              return (
+                <IntegerField
+                  key={field}
+                  id={`${props.idPrefix}-${field}`}
+                  label={field}
+                  value={props.compat[field]}
+                  epoch={props.epoch}
+                  invalidLabel={props.t('invalidInteger')}
+                  disabled={props.disabled === true}
+                  onEdit={(value) => setField(field, value)}
+                />
+              )
+            }
+            // 余下只有枚举（readonly string[]）：boolean/object/number 已在上方分支消化
             return (
               <SelectField
                 key={field}

package/src/compat-gates.ts

@@ -0,0 +1,265 @@
+/**
+ * compat 门控表的**自动继承**：从官方 `dsh-llm-pi-ai` 安装副本现场推导，
+ * 取代早期的手抄镜像表（手抄遗漏即静默误拒官方可配字段，见 ADR/文档的
+ * 0.1.5-rc.1 教训）。
+ *
+ * 官方不导出该表（包根仅 7 个符号、`src/` 不随 npm 发布），但有两条稳定可用的
+ * 机器可读来源，本模块同时消费：
+ *
+ * 1. **运行期 bundle**（`lib/index.js`，即真正执行门控的那份代码）：
+ *    `const COMPAT_GATES = { "openai-completions": COMPLETIONS_COMPAT_GATE, ... }`
+ *    ——给出「协议 → 门控」映射（anthropic 在 bundle 内联，解析器同时支持
+ *    命名常量与内联对象两种形态）。门控表取自这里而非 d.ts，因为它是**事实源**：
+ *    运行期拒绝哪些字段由它决定。
+ * 2. **导出的 Config schema**（schemastery 标准 schema）：`providers.*.compat`
+ *    节点逐字段给出取值约束（boolean/number.step(1)/enum/对象），据此推导
+ *    取值校验，不再手写 VALUE_SPECS。
+ *
+ * 推导失败（官方改布局/改打包形态）时回退到 FALLBACK_TABLE（最后已知快照，
+ * 随本文件版本冻结）并给出诊断——绝不因推导失败弄挂插件启动。
+ * @module llm-pi/compat-gates
+ */
+
+/** 字段可配性：offer = 官方允许写；withhold = 官方为厂商内置、写时拒绝。 */
+export type CompatDisposition = 'offer' | 'withhold'
+
+/** 取值约束（从官方 schema 节点推导；'integer' = number 且 step=1）。 */
+export type CompatValue = 'boolean' | 'integer' | 'number' | 'object' | readonly string[]
+
+/** 推导结果：协议 → (字段 → 分型) + 字段 → 取值约束。 */
+export interface CompatTable {
+  readonly gates: Readonly<Record<string, Readonly<Record<string, CompatDisposition>>>>
+  readonly specs: Readonly<Record<string, CompatValue>>
+  /** 数据来源（诊断/状态行）：official = 现场推导成功。 */
+  readonly source: 'official' | 'fallback'
+  /** source=fallback 时的原因（供日志）。 */
+  readonly problem?: string
+}
+
+/** 官方 Config schema 的最小结构面（schemastery 节点；只读我们消费的部分）。 */
+export interface SchemaNode {
+  type?: string
+  dict?: Record<string, SchemaNode>
+  list?: readonly SchemaNode[]
+  inner?: SchemaNode
+  meta?: { step?: number }
+  value?: unknown
+}
+
+/** 官方插件模块表面（推导所需的两个输入）。 */
+export interface OfficialAdapterSurface {
+  /** `lib/index.js` 的绝对路径（读文本解析 COMPAT_GATES）。 */
+  bundlePath: string
+  /** 导入的模块命名空间（取 Config 导出）。 */
+  module: Record<string, unknown>
+}
+
+/** 从 `{` 起做括号配对，返回内部文本；未配对返回 undefined。 */
+function balancedBody(text: string, openIndex: number): string | undefined {
+  const start = text.indexOf('{', openIndex)
+  if (start < 0) return undefined
+  let depth = 0
+  for (let i = start; i < text.length; i += 1) {
+    const ch = text[i]
+    if (ch === '{') depth += 1
+    else if (ch === '}') {
+      depth -= 1
+      if (depth === 0) return text.slice(start + 1, i)
+    }
+  }
+  return undefined
+}
+
+/** 解析 `field: "offer" | "withhold"` 键值对。 */
+function parseGateFields(body: string): Record<string, CompatDisposition> {
+  const out: Record<string, CompatDisposition> = {}
+  for (const m of body.matchAll(/(\w+):\s*"(offer|withhold)"/g)) {
+    out[m[1] as string] = m[2] as CompatDisposition
+  }
+  return out
+}
+
+/** 取 `const NAME = { ... }` 的块体（兼容 `let`/`var` 与省略分号）。 */
+function namedBlock(bundle: string, name: string): string | undefined {
+  const re = new RegExp(`(?:const|let|var)\\s+${name}\\s*=\\s*`)
+  const m = re.exec(bundle)
+  return m === null ? undefined : balancedBody(bundle, m.index + m[0].length)
+}
+
+/** 解析顶层 `"api": IDENT` 与 `"api": { ... }` 两种条目。 */
+function splitGateEntries(body: string): Map<string, string | Record<string, CompatDisposition>> {
+  const out = new Map<string, string | Record<string, CompatDisposition>>()
+  const re = /"([^"]+)"\s*:\s*/g
+  let m: RegExpExecArray | null = re.exec(body)
+  while (m !== null) {
+    const api = m[1] as string
+    const rest = body.slice(m.index + m[0].length)
+    if (rest.startsWith('{')) {
+      const inner = balancedBody(rest, 0)
+      if (inner !== undefined) out.set(api, parseGateFields(inner))
+    } else {
+      const ident = /^[A-Za-z_$][\w$]*/.exec(rest)
+      if (ident !== null) out.set(api, ident[0])
+    }
+    m = re.exec(body)
+  }
+  return out
+}
+
+/**
+ * 从运行期 bundle 推导「协议 → 门控」：解析 COMPAT_GATES 的每条目，
+ * 命名常量回查同名 `const` 块，内联对象直接取字段。
+ */
+export function deriveGates(
+  bundle: string,
+): Record<string, Record<string, CompatDisposition>> | undefined {
+  const gatesBody = namedBlock(bundle, 'COMPAT_GATES')
+  if (gatesBody === undefined) return undefined
+  const out: Record<string, Record<string, CompatDisposition>> = {}
+  for (const [api, ref] of splitGateEntries(gatesBody)) {
+    if (typeof ref !== 'string') {
+      out[api] = ref
+      continue
+    }
+    const block = namedBlock(bundle, ref)
+    if (block === undefined) continue
+    const fields = parseGateFields(block)
+    if (Object.keys(fields).length > 0) out[api] = fields
+  }
+  return Object.keys(out).length > 0 ? out : undefined
+}
+
+/** 单个 schema 节点 → 取值约束；无法归类的返回 undefined（跳过该字段）。 */
+function specOfNode(node: SchemaNode | undefined): CompatValue | undefined {
+  if (node === undefined) return undefined
+  if (node.type === 'boolean') return 'boolean'
+  if (node.type === 'number') return node.meta?.step === 1 ? 'integer' : 'number'
+  if (node.type === 'dict') return 'object'
+  if (node.type === 'object') return 'object'
+  if (node.type === 'union' && Array.isArray(node.list) && node.list.length > 0) {
+    const values: string[] = []
+    for (const member of node.list) {
+      if (member?.type === 'const' && typeof member.value === 'string') values.push(member.value)
+      else return undefined // 含非字符串成员的联合（如模板 $var 对象）不入枚举
+    }
+    return values
+  }
+  return undefined
+}
+
+/** 从官方 Config schema 推导字段取值约束（`providers.*.compat` 节点）。 */
+export function deriveSpecs(module: Record<string, unknown>): Record<string, CompatValue> {
+  const config = module['Config'] as SchemaNode | undefined
+  const compat = config?.dict?.['providers']?.inner?.dict?.['compat']
+  const fields = compat?.dict
+  if (fields === undefined) return {}
+  const out: Record<string, CompatValue> = {}
+  for (const [field, node] of Object.entries(fields)) {
+    const spec = specOfNode(node)
+    if (spec !== undefined) out[field] = spec
+  }
+  return out
+}
+
+/** 官方门控表不可解析时的最后已知快照（0.1.5-rc.2 实测值）。 */
+export const FALLBACK_TABLE: CompatTable = {
+  source: 'fallback',
+  gates: {
+    'openai-completions': {
+      supportsStore: 'offer',
+      supportsDeveloperRole: 'offer',
+      supportsReasoningEffort: 'offer',
+      supportsUsageInStreaming: 'offer',
+      supportsFinishReason: 'offer',
+      maxTokensField: 'offer',
+      requiresToolResultName: 'offer',
+      requiresAssistantAfterToolResult: 'offer',
+      requiresThinkingAsText: 'offer',
+      requiresReasoningContentOnAssistantMessages: 'offer',
+      thinkingFormat: 'offer',
+      chatTemplateKwargs: 'offer',
+      chatTemplateArgs: 'offer',
+      supportsThinkingTokenBudget: 'offer',
+      thinkingTokenBudgetField: 'offer',
+      vllmPriority: 'offer',
+      supportsStrictMode: 'offer',
+      cacheControlFormat: 'offer',
+      supportsLongCacheRetention: 'offer',
+      openRouterRouting: 'withhold',
+      vercelGatewayRouting: 'withhold',
+      zaiToolStream: 'withhold',
+      supportsOpenAIGrammarTools: 'withhold',
+      sendSessionAffinityHeaders: 'withhold',
+      deferredToolsMode: 'withhold',
+      sessionAffinityFormat: 'withhold',
+    },
+    'openai-responses': {
+      supportsDeveloperRole: 'offer',
+      supportsMaxOutputTokens: 'offer',
+      supportsStrictMode: 'offer',
+      supportsLongCacheRetention: 'offer',
+      sessionAffinityFormat: 'withhold',
+      supportsOpenAIGrammarTools: 'withhold',
+      supportsAdditionalTools: 'withhold',
+      supportsToolSearch: 'withhold',
+      supportsExplicitPromptCacheMode: 'withhold',
+    },
+    'anthropic-messages': {
+      supportsEagerToolInputStreaming: 'offer',
+      supportsLongCacheRetention: 'offer',
+      supportsCacheControlOnTools: 'offer',
+      supportsTemperature: 'offer',
+      forceAdaptiveThinking: 'offer',
+      allowEmptySignature: 'offer',
+      supportsStrictTools: 'offer',
+      sendSessionAffinityHeaders: 'withhold',
+      supportsToolReferences: 'withhold',
+      supportsMidConvoEffort: 'withhold',
+      allowedFallbackModels: 'withhold',
+    },
+  },
+  specs: {
+    supportsStore: 'boolean',
+    supportsDeveloperRole: 'boolean',
+    supportsReasoningEffort: 'boolean',
+    supportsUsageInStreaming: 'boolean',
+    supportsFinishReason: 'boolean',
+    maxTokensField: ['max_completion_tokens', 'max_tokens'],
+    requiresToolResultName: 'boolean',
+    requiresAssistantAfterToolResult: 'boolean',
+    requiresThinkingAsText: 'boolean',
+    requiresReasoningContentOnAssistantMessages: 'boolean',
+    thinkingFormat: [
+      'openai',
+      'deepseek',
+      'openrouter',
+      'together',
+      'baseten',
+      'zai',
+      'qwen',
+      'chat-template',
+      'qwen-chat-template',
+      'string-thinking',
+      'ant-ling',
+    ],
+    chatTemplateKwargs: 'object',
+    chatTemplateArgs: 'object',
+    supportsThinkingTokenBudget: 'boolean',
+    thinkingTokenBudgetField: [
+      'thinking_token_budget',
+      'thinking_budget',
+      'thinking_budget_tokens',
+    ],
+    vllmPriority: 'integer',
+    supportsMaxOutputTokens: 'boolean',
+    supportsStrictMode: 'boolean',
+    cacheControlFormat: ['anthropic'],
+    supportsLongCacheRetention: 'boolean',
+    supportsEagerToolInputStreaming: 'boolean',
+    supportsCacheControlOnTools: 'boolean',
+    supportsTemperature: 'boolean',
+    forceAdaptiveThinking: 'boolean',
+    allowEmptySignature: 'boolean',
+    supportsStrictTools: 'boolean',
+  },
+}