@changfenhuang/dsh-genui 0.9.8 → 0.9.9

package/src/client/panel.tsx

@@ -24,7 +24,7 @@
  * apply) queues a [genui-action] user message back to the model.
  */
 import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from 'react'
-import type {} from '@deepseek-ai/dsh-client-runtime/client'
+import type {} from '@deepseek-ai/dsh-client-ui-session/client'
 import { IconChevronDownOutline14, IconChevronUpOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { GenuiActionContext, type GenuiActionHandler } from './action-context.ts'
 import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'

package/src/client/primitive-labels.ts

@@ -0,0 +1,37 @@
+/** Localized labels required by the rc.1 DSH UI primitives. */
+import type { DiffBlockLabels, JsonTreeLabels } from '@deepseek-ai/dsh-client-ui-primitives'
+
+/** Chrome labels for an inline GenUI diff block. */
+export const DIFF_BLOCK_LABELS: DiffBlockLabels = {
+  copy: '复制',
+  copied: '复制成功',
+  collapseAria: '收起差异',
+  /** Accessible label for expanding a collapsed diff tail. */
+  expandAria(hidden) { return `展开其余 ${hidden} 行差异` },
+  collapse: '收起',
+  /** Visible label for expanding a collapsed diff tail. */
+  expand(hidden) { return `… 其余 ${hidden} 行` },
+  /** Localized file-count summary in the diff footer. */
+  files(count) { return `${count} 个文件` },
+}
+
+/** Copy labels for a code block rendered inside a GenUI fence or node. */
+export const CODE_BLOCK_LABELS = {
+  copyLabel: '复制',
+  copiedLabel: '复制成功',
+} as const
+
+/** Chrome labels for an inline GenUI JSON tree. */
+export const JSON_TREE_LABELS: JsonTreeLabels = {
+  copyValue: '复制值',
+  copyJson: '复制 JSON',
+  copyPath: '复制属性路径',
+  copyPrettyJson: '复制格式化 JSON',
+  copyCompactJson: '复制紧凑 JSON',
+  copied: '已复制',
+  copyFailed: '复制失败',
+  collapseNode: '收起 JSON 节点',
+  expandNode: '展开 JSON 节点',
+  /** Tooltip for a JSON tree copy action. */
+  copyButtonTitle(action) { return `${action}；右键查看复制选项` },
+}

package/src/client/spec.ts

@@ -104,7 +104,7 @@ export interface GenuiInput {
   label?: string
   placeholder?: string
   value?: string
-  inputType?: 'text' | 'email' | 'password'
+  inputType?: 'text' | 'email' | 'password' | 'color'
   /** v2: when set, interaction sends this action back to the model. */
   action?: string
   /**
@@ -139,6 +139,12 @@ export interface GenuiCheckbox {
   checked?: boolean
   /** v2: when set, interaction sends this action back to the model. */
   action?: string
+  /**
+   * Aggregation group name. When set, toggles stay local and update the
+   * block-wide multi-answer registry instead of firing the per-click action;
+   * a sibling `submit` collects the selected labels as a string array.
+   */
+  group?: string
 }
 
 export interface GenuiLink {
@@ -396,23 +402,17 @@ export interface GenuiRadio {
   explanation?: string
 }
 
-/** Submit node: collects the answers of sibling `radio` groups in this block.
- * LOCAL-FIRST: when the questions carry `answer` data the click grades IN
- * PLACE — score, per-question right/wrong, explanations — with no model
- * round trip, and locks the questions until "重新作答" resets them. Only when
- * NO question carries answers does it fall back to firing ONE action
- * (`{type:'submit', answers, total, answered}`). */
+/** Submit node: collects sibling `radio` and grouped `checkbox` answers in
+ * this block. LOCAL-FIRST grading still applies to radio-only question scopes;
+ * aggregation scopes can emit strings for radio groups and string arrays for
+ * checkbox groups in the same `answers` object. */
 export interface GenuiSubmit {
   type: 'submit'
   label: string
   /**
-   * Optional action name. Local-first: when ANY question in scope carries
-   * `answer` data the click grades IN PLACE with zero model round trip, so
-   * no action is needed — the spec stays valid without one. Only when NO
-   * question has local answers does the submit need an action to collect
-   * `{type:'submit', answers, total, answered}`; without one the button
-   * renders disabled (honest affordance). Also fired as the reset hook if
-   * `resetAction` is absent.
+   * Optional action name. Local-first: when the in-scope questions can be
+   * graded entirely locally, no action is needed. Aggregation submits require
+   * an action and emit `{type:'submit', answers, total, answered}`.
    */
   action?: string
   /**
@@ -423,9 +423,9 @@ export interface GenuiSubmit {
   resetAction?: string
   /**
    * Optional explicit group list to wait for; when absent the submit enables
-   * once at least one grouped radio has an answer. When present it stays
-   * disabled until EVERY listed group has a recorded answer (the hint shows
-   * the progress).
+   * once at least one grouped answer (or filled field) exists. When present
+   * it stays disabled until EVERY listed radio/checkbox group has a non-empty
+   * recorded answer (the hint shows the progress).
    */
   groups?: string[]
 }

package/src/client/toolview.tsx

@@ -11,7 +11,8 @@
  * render_ui calls update one surface instead of stacking tool-row cards.
  */
 import { useEffect, useMemo } from 'react'
-import type {} from '@deepseek-ai/dsh-client-runtime/client'
+import type {} from '@deepseek-ai/dsh-client-ui-session/client'
+import type {} from '@deepseek-ai/dsh-client-ui-chat/client'
 import type { ToolCallViewProps } from '@deepseek-ai/dsh-client-ui-tool/client'
 import { GenuiBlock } from './GenuiBlock.tsx'
 import { ErrorBoundary } from './ErrorBoundary.tsx'

package/src/index.ts

@@ -2,11 +2,8 @@
  * Bundle source entry (plugin_check tool-bundle contract): the node-half
  * surface the host loader resolves through `package.json#main`.
  *
- * The `import type {}` line is NOT decorative: importing the dsh client
- * runtime's cordis Context augmentation BEFORE re-exporting the plugin keeps
- * TypeScript's global-augmentation ordering deterministic — without it,
- * TS 5.9 mis-resolves `ctx.sessions` in the client half when the plugin
- * module is first reached through this root entry.
  */
-import type {} from '@deepseek-ai/dsh-client-runtime/client'
+// Load the owner package's client augmentation before the plugin re-export so
+// TypeScript resolves client context members consistently from this root entry.
+import type {} from '@deepseek-ai/dsh-api-session-controller/client'
 export * from './plugin/index'

package/src/plugin/chart-contract.ts

@@ -1,103 +1,13 @@
 import { validateGenuiChartSemantics } from '../client/guard.ts'
 
-/** Plain object helper for raw model-authored specs. */
-function obj(value: unknown): Record<string, unknown> | undefined {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-    ? value as Record<string, unknown>
-    : undefined
-}
-
 /**
- * Visit chart nodes through the component-bearing containers understood by
- * the GenUI guard. This deliberately does not recursively inspect arbitrary
- * objects (for example `json.value` or `echart.option`), where a nested
- * `{type:"chart"}` is data rather than a GenUI node.
- */
-function visitChartNodes(
-  value: unknown,
-  visit: (node: Record<string, unknown>, at: string) => void,
-): void {
-  function walkNode(value: unknown, at: string): void {
-    const node = obj(value)
-    if (node === undefined || typeof node.type !== 'string') return
-    if (node.type === 'chart') visit(node, at)
-
-    if ((node.type === 'row' || node.type === 'col' || node.type === 'grid' || node.type === 'card') && Array.isArray(node.items)) {
-      walk(node.items, `${at}.items`)
-      return
-    }
-    if (node.type === 'tabs' && Array.isArray(node.tabs)) {
-      for (let index = 0; index < node.tabs.length; index++) {
-        const tab = obj(node.tabs[index])
-        if (tab === undefined) continue
-        const items = tab.items !== undefined ? tab.items : tab.content
-        if (Array.isArray(items)) walk(items, `${at}.tabs[${index}].items`)
-        else walkNode(items, `${at}.tabs[${index}].items`)
-      }
-      return
-    }
-    if (node.type === 'accordion' && Array.isArray(node.items)) {
-      for (let index = 0; index < node.items.length; index++) {
-        const item = obj(node.items[index])
-        if (item === undefined) continue
-        const items = item.items !== undefined ? item.items : item.content
-        if (Array.isArray(items)) walk(items, `${at}.items[${index}].items`)
-        else walkNode(items, `${at}.items[${index}].items`)
-      }
-      return
-    }
-    if (node.type === 'list' && Array.isArray(node.items)) {
-      for (let index = 0; index < node.items.length; index++) {
-        walkNode(node.items[index], `${at}.items[${index}]`)
-      }
-    }
-  }
-
-  function walk(list: unknown, path: string): void {
-    if (!Array.isArray(list)) return
-    for (let index = 0; index < list.length; index++) {
-      walkNode(list[index], `${path}[${index}]`)
-    }
-  }
-
-  const root = obj(value)
-  if (root === undefined) return
-  if (!Array.isArray(root.items) && root.type === 'chart') walkNode(root, 'spec')
-  else walk(root.items, 'items')
-}
-
-/**
- * Validate the native chart contract all the way to something the renderer
- * can actually draw. The shared guard still owns field/type validation; this
- * layer adds renderer-specific invariants that would otherwise produce an
- * empty line/donut chart or a grouped-bars shell with no points.
+ * Validate chart nodes using the guard's shared native renderability contract.
+ * The plugin-facing API remains stable while the guard remains the single
+ * owner of chart field and renderer-semantic rules.
+ *
+ * @param value - Raw GenUI spec or bare chart node.
+ * @returns Chart errors in deterministic tree order.
  */
 export function validateRenderableChartSemantics(value: unknown): string[] {
-  const errors = validateGenuiChartSemantics(value)
-  visitChartNodes(value, (node, at) => {
-    const kind = node.kind === undefined ? 'bars' : node.kind
-
-    if (Array.isArray(node.data) && node.data.length === 0) {
-      errors.push(`${at}.data must not be empty`)
-    }
-    if (Array.isArray(node.series)) {
-      if (node.series.length === 0) errors.push(`${at}.series must not be empty`)
-      for (let index = 0; index < node.series.length; index++) {
-        const series = obj(node.series[index])
-        if (series !== undefined && Array.isArray(series.data) && series.data.length === 0) {
-          errors.push(`${at}.series[${index}].data must not be empty`)
-        }
-      }
-    }
-
-    if (kind === 'line' || kind === 'donut') {
-      if (node.series !== undefined) {
-        errors.push(`${at}.series is only supported for bars`)
-      }
-      if (node.data === undefined) {
-        errors.push(`${at}.data is required for ${kind}`)
-      }
-    }
-  })
-  return errors
+  return validateGenuiChartSemantics(value)
 }

package/src/plugin/index.ts

@@ -5,8 +5,7 @@
  * model the language exists, so a session without the plugin simply never
  * emits fences and nothing changes.
  *
- * The section is a convention section (order 100-199), placed after the bash
- * guidance so the model sees it among its output-format rules.
+ * The section uses the host's centrally allocated structured-output placement.
  * @module @changfenhuang/dsh-genui
  */
 
@@ -21,9 +20,6 @@ import { basename, dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createRenderUiTool, createValidateDshUiTool } from './tool.ts'
 
-/** Convention: tool guidance uses 100–199; bash's section is 104. */
-export const GENUI_SECTION_ORDER = 105
-
 /* ---------------- lazy engine asset route ---------------- */
 
 /**
@@ -168,7 +164,7 @@ function bundledSkillProvider(): SkillProvider {
 export function apply(ctx: Context): void {
   ctx.systemPrompt.section({
     name: 'genui:fence',
-    order: GENUI_SECTION_ORDER,
+    order: ctx.systemPrompt.getSectionOrder('STRUCTURED_OUTPUT'),
     text: GENUI_SECTION_TEXT,
   })
   // The tools service is optional: hosts without tool access (or minimal

package/src/plugin/tool.ts

@@ -19,14 +19,13 @@
  */
 
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
-import type { JsonValue } from '@deepseek-ai/dsh-session'
+import type { JsonValue } from '@deepseek-ai/dsh-util-values'
 import type { GenericCallView, GenericResultView, JsonSchemaNode, ToolDefinition } from '@deepseek-ai/dsh-tools'
-import type { GenuiSpec } from '../client/spec.ts'
 import {
-  GENUI_LIMITS, countDeclaredGenuiNodes, countGenuiNodes, repairGenuiSpec,
+  isRenderableProcess, processGenuiSpec,
 } from '../client/guard.ts'
+import type { GenuiProcessResult } from '../client/guard.ts'
 import { completeFenceJson } from '../shared/fence-repair.ts'
-import { validateRenderableChartSemantics } from './chart-contract.ts'
 
 /**
  * Arguments schema: an open `spec` slot. The schema must NOT reject anything
@@ -136,18 +135,43 @@ function parseSpecJson(raw: string, shape: string): unknown {
   }
 }
 
-/** Total node count of a repaired spec — the shared guard traversal
- * (`countGenuiNodes`) so the tool reports the SAME number the panel fold and
- * validation use. A local walker used to under-count specs whose content
- * lives inside tabs/accordion/file-tree (their children are not `.items`). */
-function countNodes(spec: GenuiSpec): number {
-  return countGenuiNodes(spec, GENUI_LIMITS.maxNodes)
+/** Process a raw tool value once for all render-time decisions. */
+function processRenderableValue(value: unknown): GenuiProcessResult {
+  return processGenuiSpec(value)
+}
+
+/** Render process diagnostics as stable model-facing warning lines. */
+function formatProcessWarnings(processed: GenuiProcessResult): string[] {
+  return processed.warnings.map(warning => {
+    if (warning.kind === 'alias' && warning.canonical !== undefined) {
+      const separator = warning.path.lastIndexOf('.')
+      const canonicalPath = `${separator < 0 ? '' : warning.path.slice(0, separator + 1)}${warning.canonical}`
+      return warning.message.includes('ignored')
+        ? `⚠️ 已忽略别名字段：${warning.path} → ${canonicalPath}（ignored because canonical field '${warning.canonical}' is present）`
+        : `⚠️ 已规范化字段：${warning.path} → ${canonicalPath}（normalized/adopted as '${warning.canonical}'）`
+    }
+    return `⚠️ ${warning.message}`
+  })
+}
+
+/** Format chart-specific process errors while keeping other schema errors generic. */
+function formatProcessFailure(processed: GenuiProcessResult): string | undefined {
+  const chartErrors = processed.errors.filter(error => /(?:variant is unsupported|kind must be bars, line, or donut|requires data or series|(?:data|series) is required for|(?:\.data|\.series)(?:\[\d+\])?(?:\.(?:data|label|value|color))? must|series is only supported for bars)/.test(error))
+  return chartErrors.length === 0 ? undefined : `❌ chart 字段验证失败：\n- ${chartErrors.join('\n- ')}`
+}
+
+/** Return the legacy validation text for a process that dropped native nodes. */
+function droppedNodeFailure(processed: GenuiProcessResult): string | undefined {
+  if (!processed.errors.some(error => error.startsWith('repair dropped '))) return undefined
+  const dropped = processed.declaredNativeCount - processed.renderedNativeCount
+  return `❌ 验证未通过：检测到声明了 ${processed.declaredNativeCount} 个组件，但仅成功解析出 ${processed.renderedNativeCount} 个（有 ${dropped} 个组件因字段格式异常被丢弃）。常见原因：table 的 columns/rows 不是二维字符串数组、tabs 的 items/content 缺失、嵌套组件字段类型不符。请修正后重新验证。`
 }
 
 /** Tool-call title shared by the pending and completed presentations. */
 function cardTitle(args: unknown): string | undefined {
-  const spec = repairGenuiSpec(specOf(args))
-  return spec === null ? undefined : `渲染 UI：${spec.title ?? '未命名'}`
+  const processed = processRenderableValue(specOf(args))
+  if (!isRenderableProcess(processed) || processed.spec === null) return undefined
+  return `渲染 UI：${processed.spec.title ?? '未命名'}`
 }
 
 /**
@@ -171,21 +195,23 @@ export function createRenderUiTool(): ToolDefinition {
         // The browser toolview reads the repaired spec from result meta. The
         // spec is JSON-safe by construction (only string/number/boolean/array
         // fields after repair), so the widening cast is lossless.
-        return repairGenuiSpec(specOf(args)) as unknown as JsonValue
+        const processed = processRenderableValue(specOf(args))
+        return (isRenderableProcess(processed) ? processed.spec : null) as unknown as JsonValue
       },
     },
     async execute(args: unknown): Promise<JsonValue> {
-      const input = specOf(args)
-      const chartErrors = validateRenderableChartSemantics(input)
-      if (chartErrors.length > 0) {
-        throw new Error('render_ui spec invalid: ' + chartErrors.join('; '))
-      }
-      const spec = repairGenuiSpec(input)
-      if (spec === null) {
+      const processed = processRenderableValue(specOf(args))
+      if (processed.spec === null) {
         return 'render_ui：spec 无效 —— 根对象需要 "items" 数组（组件树白名单见系统提示词），请修正后重试。'
       }
+      if (!isRenderableProcess(processed)) {
+        throw new Error('render_ui spec invalid: ' + processed.errors.join('; '))
+      }
+      const spec = processed.spec
       const title = spec.title ?? '未命名'
-      return `已渲染 UI「${title}」（${countNodes(spec)} 个组件）。用户现在可以看到这张卡片；组件带 action 时，用户交互会以 [genui-action] 消息发回给你，届时请重新渲染更新后的界面。`
+      const warnings = formatProcessWarnings(processed)
+      const warningText = warnings.length === 0 ? '' : `\n${warnings.join('\n')}`
+      return `已渲染 UI「${title}」（${processed.renderedCount} 个组件）。用户现在可以看到这张卡片；组件带 action 时，用户交互会以 [genui-action] 消息发回给你，届时请重新渲染更新后的界面。${warningText}`
     },
     presentCall(args: unknown): GenericCallView | undefined {
       const title = cardTitle(args)
@@ -285,12 +311,6 @@ function bracketDiagnostic(raw: string): string {
 const COMMON_CAUSES =
   '常见原因：① 收尾括号错位/缺失（{ 与 }、[ 与 ] 数量不相等）② 字符串值内用了半角引号 "（中文引语请用 “” 或 「」）③ 尾随逗号 ④ 字符串未闭合'
 
-/** Return the model-facing chart field failure for one parsed fence body. */
-function chartValidationFailure(value: unknown): string | undefined {
-  const errors = validateRenderableChartSemantics(value)
-  return errors.length === 0 ? undefined : `❌ chart 字段验证失败：\n- ${errors.join('\n- ')}`
-}
-
 /** Build the validate_dsh_ui tool definition (registered alongside render_ui). */
 export function createValidateDshUiTool(): ToolDefinition {
   return {
@@ -320,26 +340,26 @@ export function createValidateDshUiTool(): ToolDefinition {
         const repaired = completeFenceJson(raw)
         if (repaired !== null) {
           const repairedValue = JSON.parse(repaired.text) as unknown
-          const chartFailure = chartValidationFailure(repairedValue)
+          const processed = processRenderableValue(repairedValue)
+          const chartFailure = formatProcessFailure(processed)
           if (chartFailure !== undefined) return chartFailure
-          if (repairGenuiSpec(repairedValue) !== null) {
-            return `❌ dsh-ui 围栏 JSON 解析失败：${detail}。\n${bracketDiagnostic(raw)}  已自动修复 ${repaired.repairs} 处，下面是修复后的 JSON，直接作为围栏正文发出即可（无需再验证）：\n\`\`\`\n${repaired.text}\n\`\`\``
+          if (processed.spec !== null && processed.errors.length === 0) {
+            const warnings = formatProcessWarnings(processed)
+            const warningText = warnings.length === 0 ? '' : `${warnings.join('\n')}\n`
+            return `❌ dsh-ui 围栏 JSON 解析失败：${detail}。\n${bracketDiagnostic(raw)}${warningText}  已自动修复 ${repaired.repairs} 处，下面是修复后的 JSON，直接作为围栏正文发出即可（无需再验证）：\n\`\`\`\n${repaired.text}\n\`\`\``
           }
         }
         return `❌ dsh-ui 围栏 JSON 解析失败：${detail}。\n${bracketDiagnostic(raw)}  自动修复未能恢复（结构损坏），请按错误信息修正后重新调用本工具验证，通过后再发出围栏。\n${COMMON_CAUSES}`
       }
-      const chartFailure = chartValidationFailure(parsed)
+      const processed = processRenderableValue(parsed)
+      const chartFailure = formatProcessFailure(processed)
       if (chartFailure !== undefined) return chartFailure
-      const spec = repairGenuiSpec(parsed)
-      if (spec === null) {
-        return '❌ 不是合法 GenUI spec：根对象需要 "items" 数组，且每个节点 type 必须在白名单内（见系统提示词）。请修正后重新验证。'
-      }
-      const validCount = countNodes(spec)
-      const declaredCount = countDeclaredGenuiNodes(parsed, GENUI_LIMITS.maxNodes + 1)
-      if (declaredCount > validCount) {
-        return `❌ 验证未通过：检测到声明了 ${declaredCount} 个组件，但仅成功解析出 ${validCount} 个（有 ${declaredCount - validCount} 个组件因字段格式异常被丢弃）。常见原因：table 的 columns/rows 不是二维字符串数组、tabs 的 items/content 缺失、嵌套组件字段类型不符。请修正后重新验证。`
+      if (processed.spec === null || processed.errors.length > 0) {
+        return droppedNodeFailure(processed)
+          ?? `❌ 不是合法 GenUI spec：${processed.errors.join('；') || '根对象需要 "items" 数组，且每个节点 type 必须在白名单内（见系统提示词）'}。请修正后重新验证。`
       }
-      return `✅ dsh-ui spec 合法（${validCount} 个组件），可以发出围栏。`
+      const warnings = formatProcessWarnings(processed)
+      return [`✅ dsh-ui spec 合法（${processed.renderedCount} 个组件），可以发出围栏。`, ...warnings].join('\n')
     },
     presentCall(): GenericCallView | undefined {
       return { card: 'generic', title: '验证 dsh-ui 围栏', kind: 'other' }