dsh-structured 0.8.2 → 0.9.1

package/src/index.js

@@ -52,16 +52,20 @@ const k = (x) => (typeof x.volatile === 'function' ? x.volatile() : x)
 /** volatile 字段在 host 侧是可读信号；普通字段原样返回。 */
 const readConfig = (x) => (x && typeof x.get === 'function' ? x.get() : x)
 
+/** 主题白名单：host 与 client 共用同一组值。 */
+export const THEMES = ['deepseek', 'codex', 'anthropic']
+
 /**
  * DSH 插件配置 schema：设置表单据此渲染，并持久化到 active profile 的 Cordis patch。
- * 不把 visual 写进 state.json，避免 structured-test 与 desktop 共享同一状态文件。
+ * 不把主题/视觉写进 state.json，避免 structured-test 与 desktop 共享同一状态文件。
  */
 export const Config = Schema.object({
-  visual: k(Schema.boolean().default(true)),
-  defaultEnabled: k(Schema.boolean().default(true)),
-  tailReminder: k(Schema.boolean().default(true)),
-  includeSubagents: k(Schema.boolean().default(false)),
-  genui: k(Schema.union(['auto', 'on', 'off']).default('auto').loose()),
+  theme: k(Schema.union(THEMES).default('deepseek').description('主题 / Theme: deepseek | codex | anthropic').loose()),
+  visual: k(Schema.boolean().default(true).description('视觉层 / Visual layer: 关闭后不加载回复区样式')),
+  defaultEnabled: k(Schema.boolean().default(true).description('新会话默认开启 / Default on for new sessions')),
+  tailReminder: k(Schema.boolean().default(true).description('尾部提醒 / Tail reminder: 每轮追加一句结构化提醒')),
+  includeSubagents: k(Schema.boolean().default(false).description('子代理注入 / Include subagents: 默认关闭')),
+  genui: k(Schema.union(['auto', 'on', 'off']).default('auto').description('GenUI 联动 / GenUI routing: auto | on | off').loose()),
 })
 
 /**
@@ -80,16 +84,17 @@ export const BUILTIN_STYLE_TEXT = [
   '4. **清晰优先，不设硬性篇幅上限**：组件是帮读者快速定位结论的工具，不是加信息的借口；短答不套卡，长答按信息量组织；判断标准是读者只看首段标题 + 表格首列/列表首句，就能知道结论和下一步；细节写文件，回复保留结论与路径。',
   '5. **支撑信息带证据**：每条支撑尽量带数字、路径或结果；没有证据的判断明确标成推断。',
   '6. **可复制内容用代码块**：提示词、命令、配置、JSON、SQL 等需要复制的文本，用带语言标签的代码块包裹（如 `text` / `powershell`），不要用引用块或普通段落；代码块右上角有复制按钮。',
+  '7. **代码/补丁例外**：当本轮主要是代码、代码 diff、文件修改或补丁时，代码块或 diff 卡可以直接作为第一块，不强制标题卡；不要为了结构化加标题卡、表格或「下一步」卡；仍不写过程叙事。',
 ].join('\n')
 
 /** GenUI 已安装时才追加的路由规则：交互/图表走 dsh-ui，普通卡片仍走 markdown。 */
 export const GENUI_ROUTING_TEXT = [
-  '**GenUI 已安装**：图表、可排序表格、表单、超过 8 行的大表用 ` ```dsh-ui ` fence；结论/判断/风险/下一步仍用上面的 markdown 卡片，不要为每条回复生成 JSON，也不要重复渲染同一内容。',
+  '**GenUI 已安装**：只有图表、可排序表格、表单、超过 8 行的大表才用 ` ```dsh-ui ` fence；`dsh-ui` 只能出现在 markdown 标题卡与正文之后，**不得用它的 title 充当首卡，不得把结论/判断/风险/下一步做成 dsh-ui 组件**；宿主默认要出 UI 时以本节为准，不要为每条回复生成 JSON，也不要重复渲染同一内容。',
 ].join('\n')
 
 /** 尾部提醒：一句话重复契约中最容易衰减的四件事，长度控制在几十个 token。 */
 export const TAIL_REMINDER_TEXT = [
-  '提醒：本轮最终回复第一段用无标签标题卡：加粗标题（≤60 字）/ 正文两行；表格前给 `**表格结论：**`；状态用 `✅ 完成` / `⚠️ 待做`；全文最多两个强调块；表格优先 ≤5 行；不设硬性篇幅上限；清晰优先；可复制内容用代码块。',
+  '提醒：本轮最终回复第一段必须是 markdown 无标签标题卡（代码/diff 回复例外：代码块或 diff 卡可直接作首块，不强制标题卡）：加粗标题（≤60 字）/ 正文两行（即使后文要用组件也一样）；组件只能排在标题卡之后，不得用组件充当首卡；表格前给 `**表格结论：**`；状态用 `✅ 完成` / `⚠️ 待做`；全文最多两个强调块；表格优先 ≤5 行；不设硬性篇幅上限；清晰优先；可复制内容用代码块。',
 ].join('\n')
 
 /** DSH home：优先 DSH_HOME，缺省 ~/.dsh。 */
@@ -303,16 +308,18 @@ export function setEnabledFor(sessions, defaultEnabled, sessionId, enabled) {
 
 /**
  * 生成 /structured 的状态文本（不含副作用）。
- * @param {{ sessionId: string | null, sessions: Record<string, { enabled: boolean, at: number }>, defaultEnabled: boolean, genui?: boolean, visual?: boolean }} input
+ * @param {{ sessionId: string | null, sessions: Record<string, { enabled: boolean, at: number }>, defaultEnabled: boolean, genui?: boolean, visual?: boolean, theme?: string }} input
  * @returns {string}
  */
 export function statusText(input) {
   const style = activeStyle()
   const enabled = isEnabledFor(input.sessions, input.defaultEnabled, input.sessionId)
+  const theme = THEMES.includes(input.theme) ? input.theme : 'deepseek'
   return [
     '结构化提示词：' + (enabled ? '已开启' : '已关闭') + '（本会话）',
     '新会话默认：' + (input.defaultEnabled ? '开启' : '关闭'),
     '规则来源：' + (style.source === 'custom' ? '自定义 ' + styleFile() : '内置（无标签标题卡 + 结构化组件）'),
+    '主题：' + theme + '（由插件设置 theme 控制）',
     '视觉层：' + (input.visual === false ? '已关闭' : '已开启') + '（由插件设置 visual 控制；/structured 只控制提示词）',
     'GenUI 联动：' + (input.genui ? '已检测（图表/交互走 dsh-ui，普通卡片走 fallback）' : '未检测（纯 markdown fallback）'),
     '状态文件：' + stateFile(),
@@ -330,7 +337,7 @@ export function handleCommand(invocation, api) {
   const sessionId = sessionIdOf(invocation)
   const arg = String(invocation?.rawInput ?? '').trim().toLowerCase()
   if (arg === '' || arg === 'status') {
-    return { kind: 'success', text: statusText({ sessionId, sessions: api.sessions, defaultEnabled: api.defaultEnabled, genui: api.genui, visual: api.visual }) }
+    return { kind: 'success', text: statusText({ sessionId, sessions: api.sessions, defaultEnabled: api.defaultEnabled, genui: api.genui, visual: api.visual, theme: api.theme }) }
   }
   if (arg !== 'on' && arg !== 'off') {
     return { kind: 'error', text: '未知参数：' + arg + '\n用法：/structured on | off | status' }
@@ -352,10 +359,14 @@ export function handleCommand(invocation, api) {
 /**
  * 挂载结构化输出：提示词 section + 尾部提醒 + 会话开关 + /structured 命令。
  * @param {import('@deepseek-ai/cordis').Context} ctx host 根上下文。
- * @param {{ defaultEnabled?: boolean, tailReminder?: boolean, includeSubagents?: boolean, genui?: 'auto' | 'on' | 'off', visual?: boolean }} [config]
+ * @param {{ defaultEnabled?: boolean, tailReminder?: boolean, includeSubagents?: boolean, genui?: 'auto' | 'on' | 'off', visual?: boolean, theme?: 'deepseek' | 'codex' | 'anthropic' }} [config]
  */
 export function apply(ctx, config = {}) {
   const defaultEnabled = readConfig(config?.defaultEnabled) !== false
+  const themeNow = () => {
+    const theme = readConfig(config?.theme)
+    return THEMES.includes(theme) ? theme : 'deepseek'
+  }
   const visualNow = () => readConfig(config?.visual) !== false
   const tailReminder = readConfig(config?.tailReminder) !== false
   const includeSubagents = readConfig(config?.includeSubagents) === true
@@ -482,6 +493,7 @@ export function apply(ctx, config = {}) {
                 defaultEnabled,
                 genui: genuiNow(),
                 visual: visualNow(),
+                theme: themeNow(),
                 onChange: (sessionId, enabled, result) => {
                   warn(
                     'session ' + sessionId + ' structured ' + (enabled ? 'on' : 'off') + (result.ok ? '' : '（持久化失败）'),

package/test/client-visual.test.mjs

@@ -116,7 +116,7 @@ function makeContext(form) {
 test('client：visual=false 停用视觉层，visual=true 恢复', () => {
   const dom = makeDom()
   const form = {
-    value: { visual: false },
+    value: { visual: false, theme: 'codex' },
     listeners: new Set(),
     getSnapshot() {
       return { value: this.value }
@@ -131,16 +131,27 @@ test('client：visual=false 停用视觉层，visual=true 恢复', () => {
 
   assert.equal(dom.styles.has('dsh-structured-skin-style'), false)
   assert.equal(dom.attrs.has('data-dsh-structured'), false)
+  assert.equal(dom.document.body['data-dsh-structured-theme'], undefined)
 
-  form.value = { visual: true }
+  form.value = { visual: true, theme: 'codex' }
   for (const listener of form.listeners) listener()
   assert.equal(dom.styles.has('dsh-structured-skin-style'), true)
   assert.equal(dom.attrs.get('data-dsh-structured'), 'active')
+  assert.equal(dom.document.body['data-dsh-structured-theme'], 'codex')
 
-  form.value = { visual: false }
+  form.value = { visual: true, theme: 'anthropic' }
+  for (const listener of form.listeners) listener()
+  assert.equal(dom.document.body['data-dsh-structured-theme'], 'anthropic')
+
+  form.value = { visual: true, theme: 'bogus' }
+  for (const listener of form.listeners) listener()
+  assert.equal(dom.document.body['data-dsh-structured-theme'], 'deepseek')
+
+  form.value = { visual: false, theme: 'anthropic' }
   for (const listener of form.listeners) listener()
   assert.equal(dom.styles.has('dsh-structured-skin-style'), false)
   assert.equal(dom.attrs.has('data-dsh-structured'), false)
+  assert.equal(dom.document.body['data-dsh-structured-theme'], undefined)
 
   dispose()
 })
@@ -161,3 +172,119 @@ test('client：configForms 不可用时视觉层保持默认开启', () => {
   assert.equal(dom.attrs.get('data-dsh-structured'), 'active')
   dispose()
 })
+
+function attrsElement(extra = {}) {
+  const attrs = new Map()
+  return {
+    attrs,
+    setAttribute(name, value) {
+      attrs.set(name, value)
+    },
+    removeAttribute(name) {
+      attrs.delete(name)
+    },
+    getAttribute(name) {
+      return attrs.get(name)
+    },
+    ...extra,
+  }
+}
+
+test('client：diff 代码块不套插件 chrome，普通代码块才套', () => {
+  const dom = makeDom()
+  const module = loadClient(dom)
+  const diffCode = attrsElement({
+    querySelector: () => ({ textContent: 'diff' }),
+    closest: () => null,
+  })
+  const jsCode = attrsElement({
+    querySelector: () => ({ textContent: 'js' }),
+    closest: () => null,
+  })
+  const diffCopyCode = attrsElement({
+    querySelector: () => ({ textContent: 'diff复制' }),
+    closest: () => null,
+  })
+  assert.equal(module.__test.isDiffCode(diffCopyCode), true)
+  const root = {
+    querySelectorAll(selector) {
+      if (selector.includes('.md-code-block')) return [diffCode, jsCode, diffCopyCode]
+      return []
+    },
+  }
+  module.__test.decorate(root)
+  assert.equal(diffCode.attrs.get('data-dsh-structured-skip'), 'code')
+  assert.equal(diffCode.attrs.get('data-dsh-structured-code'), undefined)
+  assert.equal(diffCode.attrs.get('data-dsh-structured-lang'), undefined)
+  assert.equal(diffCopyCode.attrs.get('data-dsh-structured-skip'), 'code')
+  assert.equal(jsCode.attrs.get('data-dsh-structured-code'), '1')
+  assert.equal(jsCode.attrs.get('data-dsh-structured-lang'), 'js')
+})
+
+test('client：普通状态表仍套插件表格样式并标状态行', () => {
+  const dom = makeDom()
+  const module = loadClient(dom)
+  const row = attrsElement({
+    textContent: '✅ 完成',
+    cells: [{ textContent: '✅ 完成' }],
+    closest: () => null,
+  })
+  const table = attrsElement({
+    closest: () => null,
+    querySelectorAll: (selector) => (selector === 'tbody tr' ? [row] : []),
+  })
+  const root = {
+    querySelectorAll(selector) {
+      if (selector === '[class*="_markdown_"] table') return [table]
+      if (selector === '[class*="_markdown_"] tbody tr') return [row]
+      if (selector === '[class*="_markdown_"] table tr') return [row]
+      return []
+    },
+  }
+  module.__test.decorate(root)
+  assert.equal(table.attrs.get('data-dsh-structured-status-table'), '1')
+  assert.equal(table.attrs.get('data-dsh-structured-skip'), undefined)
+  assert.equal(row.attrs.get('data-dsh-structured-row'), 'success')
+})
+
+test('client：GenUI 区域不写入 skip，保持旧行为', () => {
+  const dom = makeDom()
+  const module = loadClient(dom)
+  const code = attrsElement({
+    querySelector: () => ({ textContent: 'js' }),
+    closest: (selector) => (selector.includes('genui') ? {} : null),
+  })
+  const table = attrsElement({
+    closest: (selector) => (selector.includes('genui') ? {} : null),
+    querySelectorAll: () => [],
+  })
+  const root = {
+    querySelectorAll(selector) {
+      if (selector.includes('.md-code-block')) return [code]
+      if (selector === '[class*="_markdown_"] table') return [table]
+      return []
+    },
+  }
+  module.__test.decorate(root)
+  assert.equal(code.attrs.get('data-dsh-structured-skip'), undefined)
+  assert.equal(code.attrs.get('data-dsh-structured-code'), undefined)
+  assert.equal(table.attrs.get('data-dsh-structured-skip'), undefined)
+})
+
+test('client：diff 表格不套插件表格样式', () => {
+  const dom = makeDom()
+  const module = loadClient(dom)
+  const table = attrsElement({
+    closest: (selector) => (selector.includes('[data-diff]') ? {} : null),
+    querySelectorAll: () => [],
+  })
+  const root = {
+    querySelectorAll(selector) {
+      if (selector === '[class*="_markdown_"] table') return [table]
+      return []
+    },
+  }
+  module.__test.decorate(root)
+  assert.equal(table.attrs.get('data-dsh-structured-skip'), 'table')
+  assert.equal(table.attrs.get('data-dsh-structured-status-table'), undefined)
+})

package/test/measure-prose.test.mjs

@@ -0,0 +1,9 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { firstScreenStructured } from '../scripts/measure-prose.mjs'
+
+test('代码/diff 优先回复：首屏 fenced code 计为结构化', () => {
+  assert.equal(firstScreenStructured('```js\nconst answer = 42\n```\n\n说明。'), true)
+  assert.equal(firstScreenStructured('```diff\n- old\n+ new\n```\n\n说明。'), true)
+  assert.equal(firstScreenStructured('第一段是普通散文。\n\n第二段也是普通散文。'), false)
+})

package/test/structured.test.mjs

@@ -87,6 +87,9 @@ test('内置规则覆盖首句结论、组件、清晰度三件事', () => {
   assert.match(BUILTIN_STYLE_TEXT, /过程叙事/)
   assert.match(BUILTIN_STYLE_TEXT, /推断/)
   assert.match(BUILTIN_STYLE_TEXT, /短答不套卡/)
+  assert.match(BUILTIN_STYLE_TEXT, /代码\/补丁例外/)
+  assert.match(BUILTIN_STYLE_TEXT, /不强制标题卡/)
+  assert.match(TAIL_REMINDER_TEXT, /代码\/diff 回复例外/)
   assert.doesNotMatch(BUILTIN_STYLE_TEXT, /500\s*字|≤\s*500|字数上限/)
   assert.match(BUILTIN_STYLE_TEXT, /可复制内容用代码块/)
   assert.match(TAIL_REMINDER_TEXT, /加粗标题/)
@@ -98,6 +101,10 @@ test('内置规则覆盖首句结论、组件、清晰度三件事', () => {
   assert.match(BUILTIN_STYLE_TEXT, /下一步/)
   assert.match(BUILTIN_STYLE_TEXT, /✅ 完成/)
   assert.match(GENUI_ROUTING_TEXT, /dsh-ui/)
+  assert.match(TAIL_REMINDER_TEXT, /即使后文要用组件也一样/)
+  assert.match(TAIL_REMINDER_TEXT, /不得用组件充当首卡/)
+  assert.match(GENUI_ROUTING_TEXT, /不得用它的 title 充当首卡/)
+  assert.match(GENUI_ROUTING_TEXT, /以本节为准/)
 })
 
 test('detectGenui：profile 清单不再作为 auto 依据，config 可强制', () => {
@@ -528,7 +535,7 @@ test('client：视觉层可由 configForms 的 visual 设置关闭', () => {
   const client = readFileSync('src/client.js', 'utf8')
   assert.match(client, /configForms/)
   assert.match(client, /getSnapshot/)
-  assert.match(client, /visual !== false/)
+  assert.match(client, /readValue\(value\.visual\) !== false/)
   assert.match(client, /applyVisual/)
   assert.doesNotMatch(client, /state\.json/)
 })

package/test/theme.test.mjs

@@ -0,0 +1,121 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import { Config, statusText, THEMES } from '../src/index.js'
+import { checkThemeContrast, THEME_TOKENS } from '../scripts/theme-contrast.mjs'
+
+const value = (field) => (field && typeof field.get === 'function' ? field.get() : field)
+
+test('0.9.0 Config：theme 默认 deepseek，三值可选', () => {
+  assert.deepEqual(THEMES, ['deepseek', 'codex', 'anthropic'])
+  assert.equal(value(Config({}).theme), 'deepseek')
+  assert.equal(value(Config({ theme: 'codex' }).theme), 'codex')
+  assert.equal(value(Config({ theme: 'anthropic' }).theme), 'anthropic')
+  assert.equal(value(Config({ defaultEnabled: false }).defaultEnabled), false)
+})
+
+test('0.9.1 Config：六个字段的默认值与显式值', () => {
+  const defaults = Config({})
+  assert.equal(value(defaults.theme), 'deepseek')
+  assert.equal(value(defaults.visual), true)
+  assert.equal(value(defaults.defaultEnabled), true)
+  assert.equal(value(defaults.tailReminder), true)
+  assert.equal(value(defaults.includeSubagents), false)
+  assert.equal(value(defaults.genui), 'auto')
+  const custom = Config({
+    theme: 'codex',
+    visual: false,
+    defaultEnabled: false,
+    tailReminder: false,
+    includeSubagents: true,
+    genui: 'on',
+  })
+  assert.equal(value(custom.theme), 'codex')
+  assert.equal(value(custom.visual), false)
+  assert.equal(value(custom.defaultEnabled), false)
+  assert.equal(value(custom.tailReminder), false)
+  assert.equal(value(custom.includeSubagents), true)
+  assert.equal(value(custom.genui), 'on')
+})
+
+test('0.9.1 Config：六个字段全部 volatile，且带中英 description', () => {
+  for (const field of ['theme', 'visual', 'defaultEnabled', 'tailReminder', 'includeSubagents', 'genui']) {
+    const meta = Config.dict[field].meta
+    assert.ok(meta, `${field} meta`)
+    assert.equal(meta.volatile, true, `${field} volatile=true`)
+    assert.ok(String(meta.description ?? '').length > 8, `${field} description`)
+  }
+})
+
+test('0.9.1 client：token 语义色/代码块实际使用', () => {
+  const client = readFileSync(new URL('../src/client.js', import.meta.url), 'utf8')
+  assert.match(client, /THEMES\.includes\(theme\)/)
+  assert.match(client, /body\[data-dsh-structured-theme="codex"\]/)
+  assert.match(client, /body\[data-ds-dark-theme\]\[data-dsh-structured-theme="anthropic"\]/)
+  assert.match(client, /\.md-code-block\[\$\{CODE_ATTR\}="1"\]\{[^}]*background:var\(--ds-code-bg\)/s)
+  assert.match(client, /\.md-code-block\[\$\{CODE_ATTR\}="1"\] pre\{[^}]*color:var\(--ds-code-text\)/s)
+  assert.match(client, /var\(--ds-success\)/)
+  assert.match(client, /var\(--ds-warn\)/)
+  assert.match(client, /var\(--ds-error\)/)
+})
+
+test('0.9.0 statusText：显示 theme 与 visual', () => {
+  const text = statusText({
+    sessionId: 'session-a',
+    sessions: {},
+    defaultEnabled: true,
+    theme: 'anthropic',
+    visual: false,
+  })
+  assert.match(text, /主题：anthropic/)
+  assert.match(text, /视觉层：已关闭/)
+})
+
+test('0.9.0 client：主题 token/暗色 selector/code token 存在，旧 selector 已删', () => {
+  const client = readFileSync(new URL('../src/client.js', import.meta.url), 'utf8')
+  assert.match(client, /body\[data-ds-dark-theme\]/)
+  assert.match(client, /data-dsh-structured-theme/)
+  assert.match(client, /--ds-code-bg/)
+  assert.match(client, /--ds-code-text/)
+  assert.match(client, /--ds-accent-text/)
+  assert.doesNotMatch(client, /\[data-theme="dark"\]/)
+  assert.doesNotMatch(client, /--dsw-alias-state-/)
+  assert.match(client, /--ds-accent:#2563EB/)
+  for (const theme of ['codex', 'anthropic']) assert.match(client, new RegExp(`data-dsh-structured-theme="${theme}"`))
+  assert.match(client, /a\{color:var\(--ds-accent-text\)/)
+  assert.match(client, /li::marker\{color:var\(--ds-accent-text\)/)
+  assert.match(client, /p\[\$\{LEAD_ATTR\}="table"\] strong\{color:var\(--ds-accent-text\)/)
+  assert.match(client, /color:var\(--ds-accent-text\);overflow-wrap:anywhere/)
+  assert.match(client, /blockquote\[\$\{TONE_ATTR\}\]>p:first-child>strong:first-child\{color:var\(--ds-accent-text\)/)
+  const narrow = client.slice(client.indexOf('@media (max-width:720px)'), client.indexOf('@media (prefers-reduced-motion'))
+  assert.match(narrow, /table:not\(\[\$\{SKIP_ATTR\}\]\)/)
+  assert.doesNotMatch(narrow, /\[class\*="_markdown_"\] table\{/)
+})
+
+test('0.9.1 主题 v2：三套 token 精确值与 accentText', () => {
+  assert.equal(THEME_TOKENS.deepseek.light.accent, '#2563EB')
+  assert.equal(THEME_TOKENS.deepseek.light.accentText, '#2563EB')
+  assert.equal(THEME_TOKENS.deepseek.dark.accentText, '#60A5FA')
+  assert.equal(THEME_TOKENS.codex.light.accent, '#10A37F')
+  assert.equal(THEME_TOKENS.codex.light.accentText, '#0B6B4F')
+  assert.equal(THEME_TOKENS.codex.light.surface2, '#F0F7F4')
+  assert.equal(THEME_TOKENS.codex.dark.accent, '#34D399')
+  assert.equal(THEME_TOKENS.codex.dark.accentText, '#6EE7B7')
+  assert.equal(THEME_TOKENS.codex.dark.surface, '#0B1512')
+  assert.equal(THEME_TOKENS.anthropic.light.accent, '#CC785C')
+  assert.equal(THEME_TOKENS.anthropic.light.accentText, '#A14A2E')
+  assert.equal(THEME_TOKENS.anthropic.light.surface, '#FAF9F5')
+  assert.equal(THEME_TOKENS.anthropic.light.text, '#141413')
+  assert.equal(THEME_TOKENS.anthropic.dark.accent, '#E8A087')
+  const client = readFileSync(new URL('../src/client.js', import.meta.url), 'utf8')
+  assert.match(client, /--ds-accent:#10A37F;--ds-accent-text:#0B6B4F/)
+  assert.match(client, /--ds-accent:#CC785C;--ds-accent-text:#A14A2E/)
+  assert.match(client, /blockquote\[\$\{TONE_ATTR\}="warn"\]\{--ds-accent:var\(--ds-warn\);--ds-accent-text:var\(--ds-warn\)\}/)
+  assert.match(client, /blockquote\[\$\{TONE_ATTR\}="success"\]\{--ds-accent:var\(--ds-success\);--ds-accent-text:var\(--ds-success\)\}/)
+})
+
+test('0.9.0 对比度：3×2 全组 60 项通过', () => {
+  const { results, failures } = checkThemeContrast()
+  assert.equal(failures.length, 0, JSON.stringify(failures, null, 2))
+  assert.equal(results.length, 60)
+})