dsh-structured 0.8.3 → 0.9.2

package/lib/index.js

@@ -54,16 +54,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()),
 })
 
 /**
@@ -82,6 +86,7 @@ export const BUILTIN_STYLE_TEXT = [
   '4. **清晰优先，不设硬性篇幅上限**：组件是帮读者快速定位结论的工具，不是加信息的借口；短答不套卡，长答按信息量组织；判断标准是读者只看首段标题 + 表格首列/列表首句，就能知道结论和下一步；细节写文件，回复保留结论与路径。',
   '5. **支撑信息带证据**：每条支撑尽量带数字、路径或结果；没有证据的判断明确标成推断。',
   '6. **可复制内容用代码块**：提示词、命令、配置、JSON、SQL 等需要复制的文本，用带语言标签的代码块包裹（如 `text` / `powershell`），不要用引用块或普通段落；代码块右上角有复制按钮。',
+  '7. **代码/补丁例外**：当本轮主要是代码、代码 diff、文件修改或补丁时，代码块或 diff 卡可以直接作为第一块，不强制标题卡；不要为了结构化加标题卡、表格或「下一步」卡；仍不写过程叙事。',
 ].join('\n')
 
 /** GenUI 已安装时才追加的路由规则：交互/图表走 dsh-ui，普通卡片仍走 markdown。 */
@@ -91,7 +96,7 @@ export const GENUI_ROUTING_TEXT = [
 
 /** 尾部提醒：一句话重复契约中最容易衰减的四件事，长度控制在几十个 token。 */
 export const TAIL_REMINDER_TEXT = [
-  '提醒：本轮最终回复第一段必须是 markdown 无标签标题卡：加粗标题（≤60 字）/ 正文两行（即使后文要用组件也一样）；组件只能排在标题卡之后，不得用组件充当首卡；表格前给 `**表格结论：**`；状态用 `✅ 完成` / `⚠️ 待做`；全文最多两个强调块；表格优先 ≤5 行；不设硬性篇幅上限；清晰优先；可复制内容用代码块。',
+  '提醒：本轮最终回复第一段必须是 markdown 无标签标题卡（代码/diff 回复例外：代码块或 diff 卡可直接作首块，不强制标题卡）：加粗标题（≤60 字）/ 正文两行（即使后文要用组件也一样）；组件只能排在标题卡之后，不得用组件充当首卡；表格前给 `**表格结论：**`；状态用 `✅ 完成` / `⚠️ 待做`；全文最多两个强调块；表格优先 ≤5 行；不设硬性篇幅上限；清晰优先；可复制内容用代码块。',
 ].join('\n')
 
 /** DSH home：优先 DSH_HOME，缺省 ~/.dsh。 */
@@ -305,16 +310,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(),
@@ -332,7 +339,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' }
@@ -354,10 +361,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
@@ -484,6 +495,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-structured",
-  "version": "0.8.3",
+  "version": "0.9.2",
   "description": "Structured output for DSH: no-label title card first, then tables/lists/steps; per-session switch and style.md override. 让 DSH 的每条实质回复默认结构化。",
   "type": "module",
   "main": "lib/index.js",
@@ -64,6 +64,7 @@
     "!docs/PUBLISH-READY.md",
     "!docs/RELEASE-NOTES-0.7.4.md",
     "!docs/MAINTENANCE*.md",
+    "!docs/ACCEPTANCE-0.9.1.md",
     "assets/screenshots",
     "screenshots.json",
     "test",
@@ -79,6 +80,7 @@
     "build": "node scripts/build.mjs",
     "pretest": "node scripts/build.mjs",
     "test": "node --test test/*.test.mjs",
+    "theme-contrast": "node scripts/theme-contrast.mjs",
     "prepack": "node scripts/build.mjs"
   },
   "engines": {

package/screenshots.json

@@ -2,5 +2,7 @@
   "assets/screenshots/01-title-card.png",
   "assets/screenshots/06-status-table.png",
   "assets/screenshots/07-code-block.png",
-  "assets/screenshots/08-narrow.png"
+  "assets/screenshots/08-narrow.png",
+  "assets/screenshots/09-theme-light.png",
+  "assets/screenshots/10-theme-dark.png"
 ]

package/scripts/measure-prose.mjs

@@ -92,7 +92,8 @@ export function analysisText(text) {
 
 /**
  * 首屏是否出现结构。按字符数截断而不是按行数，避免长段落把结构推到屏幕外。
- * dsh-ui 组件块在原文里识别；普通代码块不算结构（先剥掉，避免代码里的 | / - 被误判）。
+ * 代码/ diff 优先回复：首屏出现 fenced code（含 diff/patch）计为结构化；
+ * 非代码的 fenced block 仍先剥掉，避免代码里的 | / - 被误判。
  * @param {string} text
  * @param {number} limit
  * @returns {boolean}
@@ -100,6 +101,7 @@ export function analysisText(text) {
 export function firstScreenStructured(text, limit = DEFAULT_FIRST_SCREEN) {
   const head = text.slice(0, limit)
   if (head.includes('```dsh-ui')) return true
+  if (/```(?!dsh-ui)/.test(head)) return true
   // 非 dsh-ui 的 fenced block：从开栅栏起整段丢弃（含未闭合到首屏末尾的情况）。
   const cleaned = head.replace(/```(?!dsh-ui)[^\n]*\n[\s\S]*?(?:```|$)/g, '\n')
   const lines = cleaned.split('\n')

package/scripts/theme-contrast.mjs

@@ -0,0 +1,104 @@
+#!/usr/bin/env node
+/** 3×2 主题 token 对比度门禁：正文/次要文字/强调色/状态色/代码块。 */
+import { pathToFileURL } from 'node:url'
+
+export const THEME_TOKENS = {
+  deepseek: {
+    light: {
+      surface: '#FFFFFF', surface2: '#F4F7FB', text: '#0F172A', muted: '#5B6B82',
+      border: '#E2E8F0', accent: '#2563EB', accentText: '#2563EB', success: '#166534', warn: '#92400E', error: '#991B1B',
+      codeBg: '#F6F8FA', codeText: '#0F172A',
+    },
+    dark: {
+      surface: '#111827', surface2: '#1F2937', text: '#E5E7EB', muted: '#9CA3AF',
+      border: '#374151', accent: '#60A5FA', accentText: '#60A5FA', success: '#4ADE80', warn: '#FBBF24', error: '#F87171',
+      codeBg: '#0B1220', codeText: '#E5E7EB',
+    },
+  },
+  codex: {
+    light: {
+      surface: '#FFFFFF', surface2: '#F0F7F4', text: '#0D1117', muted: '#4F625A',
+      border: '#CFE3DB', accent: '#10A37F', accentText: '#0B6B4F', success: '#116329', warn: '#7D4E00', error: '#A40E26',
+      codeBg: '#F0F7F4', codeText: '#0D1117',
+    },
+    dark: {
+      surface: '#0B1512', surface2: '#12211B', text: '#E6F2EC', muted: '#9DB2A8',
+      border: '#233A31', accent: '#34D399', accentText: '#6EE7B7', success: '#3FB950', warn: '#D29922', error: '#F85149',
+      codeBg: '#07100D', codeText: '#E6F2EC',
+    },
+  },
+  anthropic: {
+    light: {
+      surface: '#FAF9F5', surface2: '#F5F1E8', text: '#141413', muted: '#6B6359',
+      border: '#E5E0D5', accent: '#CC785C', accentText: '#A14A2E', success: '#266B4D', warn: '#92400E', error: '#8C1D18',
+      codeBg: '#F5F1E8', codeText: '#141413',
+    },
+    dark: {
+      surface: '#1F1E1D', surface2: '#2A2825', text: '#F5F1E8', muted: '#A8A29A',
+      border: '#3A3733', accent: '#E8A087', accentText: '#E8A087', success: '#6FBF9A', warn: '#E0A458', error: '#F28B82',
+      codeBg: '#171614', codeText: '#F5F1E8',
+    },
+  },
+}
+
+const hex = (value) => {
+  const raw = value.replace('#', '')
+  return [0, 2, 4].map((offset) => parseInt(raw.slice(offset, offset + 2), 16))
+}
+
+const luminance = (rgb) => {
+  const [r, g, b] = rgb.map((channel) => {
+    const c = channel / 255
+    return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4
+  })
+  return 0.2126 * r + 0.7152 * g + 0.0722 * b
+}
+
+export function contrastRatio(foreground, background) {
+  const a = luminance(hex(foreground))
+  const b = luminance(hex(background))
+  return (Math.max(a, b) + 0.05) / (Math.min(a, b) + 0.05)
+}
+
+export function blend(foreground, background, alpha) {
+  const fg = hex(foreground)
+  const bg = hex(background)
+  return '#' + fg.map((channel, index) => Math.round(channel * alpha + bg[index] * (1 - alpha)).toString(16).padStart(2, '0')).join('')
+}
+
+export function checkThemeContrast() {
+  const failures = []
+  const results = []
+  for (const [theme, modes] of Object.entries(THEME_TOKENS)) {
+    for (const [mode, token] of Object.entries(modes)) {
+      const pairs = [
+        ['text/surface', token.text, token.surface, 4.5],
+        ['text/surface2', token.text, token.surface2, 4.5],
+        ['muted/surface2', token.muted, token.surface2, 4.5],
+        ['accentText/surface2', token.accentText, token.surface2, 4.5],
+        ['accentText/card6%', token.accentText, blend(token.accent, token.surface, 0.06), 4.5],
+        ['success/12%', token.success, blend(token.success, token.surface, 0.12), 4.5],
+        ['warn/12%', token.warn, blend(token.warn, token.surface, 0.12), 4.5],
+        ['error/12%', token.error, blend(token.error, token.surface, 0.12), 4.5],
+        ['codeText/codeBg', token.codeText, token.codeBg, 4.5],
+        ['accent/surface', token.accent, token.surface, 3],
+      ]
+      for (const [name, fg, bg, minimum] of pairs) {
+        const ratio = contrastRatio(fg, bg)
+        results.push({ theme, mode, pair: name, ratio, minimum })
+        if (ratio < minimum) failures.push({ theme, mode, pair: name, ratio, minimum })
+      }
+    }
+  }
+  return { results, failures }
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const { results, failures } = checkThemeContrast()
+  for (const row of results) console.log(`${row.theme}/${row.mode} ${row.pair}: ${row.ratio.toFixed(2)}`)
+  if (failures.length > 0) {
+    console.error(JSON.stringify(failures, null, 2))
+    process.exit(1)
+  }
+  console.log(`PASS ${results.length} checks`)
+}