openyida 2026.9.21 → 2026.9.22-beta.2

package/lib/design-plan/materialize.js

@@ -4,24 +4,25 @@ const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
 const { CliError } = require('../core/cli-error');
-const { t } = require('../core/i18n');
 const { normalizePlan, assertThemeProfile } = require('./normalize');
 const { readJson, writeFiles } = require('./files');
-const { prepareUpdates } = require('./artifact-updates');
 const { validateAuthoring } = require('./validate');
-const { buildEntryNavigation, ENTRY_MODE_SUMMARIES } = require('./entry-navigation');
-const { buildPageNavigationPolicy } = require('./navigation-policy');
-const { buildAssetTasks } = require('../asset/asset-plan');
 const { mergeParts } = require('./parallel');
 const { performance } = require('perf_hooks');
 const { readDesignTokens, applyDesignTokens } = require('../app/theme-from-design');
-const { PLAN_SKILL_ROOT, loadThemeIndex, themeTemplatePath, themeNavTheme, resolveThemeColors, resolveColorToken } = require('./themes');
-const { parseDesignDocument, serializeDesignDocument, validateDesignDocument } = require('../design/document');
 
 const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
+const PLAN_SKILL_ROOT = path.join(
+  PACKAGE_ROOT,
+  'yida-skills',
+  'skills',
+  'yida-design',
+  'sub_skill',
+  'yida-design-plan'
+);
+const THEME_DIR = path.join(PLAN_SKILL_ROOT, 'templates', 'design-themes');
+const THEME_INDEX_PATH = path.join(THEME_DIR, 'index.json');
 const HTML_RENDERER_PATH = path.join(PLAN_SKILL_ROOT, 'scripts', 'render_build_plan.py');
-const PAGE_CONTINUITY_PATH = path.join(PACKAGE_ROOT, 'yida-skills', 'skills', 'yida-design', 'references', 'page-continuity.md');
-const THEME_CONSISTENCY_PATH = path.join(PACKAGE_ROOT, 'yida-skills', 'skills', 'yida-design', 'references', 'application-theme-consistency.md');
 
 function text(value, fallback = '-') {
   if (value === undefined || value === null || value === '') {
@@ -65,10 +66,11 @@ function visualSelections(plan) {
     description: forUser.styleSummary || '保持清晰、稳定并适合持续业务操作。',
     source: forUser.styleSource || selectedTheme.source || 'legacy_default',
   };
-  const theme = loadThemeIndex().themes.find(item => item.themeId === selectedTheme.themeId);
-  const navigationStyle = {
-    ...(forUser.navigationStyle || {}),
-    ...(theme && theme.mode !== 'creative' ? { tone: themeNavTheme(theme), toneSource: 'theme_derived' } : {}),
+  const navigationStyle = forUser.navigationStyle || {
+    structure: 'side',
+    tone: 'light',
+    source: 'legacy_default',
+    selectionReason: '兼容旧版搭建计划；新计划必须显式记录导航选择。',
   };
   return { visual, forUser, selectedTheme, visualDirection, navigationStyle };
 }
@@ -77,15 +79,6 @@ function navigationToneLabel(value) {
   return value === 'dark' ? '深色' : '浅色';
 }
 
-function resolveContentTone(theme, tokens) {
-  if (['light', 'dark'].includes(theme.contentTone)) {return theme.contentTone;}
-  requireFact(theme.mode === 'creative', `主题 ${theme.themeId} 缺少 contentTone`);
-  const pageColor = resolveColorToken(tokens, '--pod-page-bg-color');
-  requireFact(/^#[\dA-F]{6}$/i.test(pageColor || ''), '自由创意必须提供可判断界面明暗的 --pod-page-bg-color');
-  const rgb = [1, 3, 5].map(index => parseInt(pageColor.slice(index, index + 2), 16));
-  return rgb[0] * 0.2126 + rgb[1] * 0.7152 + rgb[2] * 0.0722 < 128 ? 'dark' : 'light';
-}
-
 function requireFact(condition, message) {
   if (!condition) {throw new CliError(message, { code: 'DESIGN_PLAN_INCOMPLETE_CONTRACT' });}
 }
@@ -114,7 +107,7 @@ function validateBusiness(plan, execution) {
   }
   requireFact(object(execution), 'execution 必须是对象');
   const arrays = ['resourceBlueprint', 'resourceCreationOrder', 'pageImplementationOrder', 'navigationOrder', 'sampleDataPlan', 'acceptanceCriteria'];
-  const allowed = [...arrays, 'navigationFallback', 'interactionStates', 'explicitScope', 'appConfig', 'entryRecommendation'];
+  const allowed = [...arrays, 'navigationFallback', 'interactionStates', 'explicitScope', 'appConfig'];
   for (const key of Object.keys(execution)) {
     requireFact(allowed.includes(key), `未知 execution 字段：${key}`);
     if (arrays.includes(key)) {requireFact(Array.isArray(execution[key]), `execution.${key} 必须是数组`);}
@@ -136,9 +129,6 @@ function validateBusiness(plan, execution) {
   for (const key of ['resourceBlueprint', 'resourceCreationOrder', 'acceptanceCriteria']) {
     if (execution[key] !== undefined) {requireFact(nonEmptyList(execution[key]), `${key} 不能为空`);}
   }
-  if (execution.acceptanceCriteria !== undefined) {
-    requireFact(execution.acceptanceCriteria.every(nonEmpty), 'acceptanceCriteria 必须使用非空业务验收说明');
-  }
   if (execution.navigationFallback !== undefined) {requireFact(nonEmpty(execution.navigationFallback), 'navigationFallback 不能为空');}
 }
 
@@ -197,35 +187,23 @@ function navigationConfig(plan) {
   return { navigationType, hideAppNav, layoutDirection };
 }
 
-function sceneForPage(page) {
-  const patternScenes = {
-    'data-insight': 'dashboard', 'catalog-browse': 'list', 'brand-landing': 'landing',
-    'progress-narrative': 'detail', 'split-pane-ops': 'detail',
-  };
-  return page.pageSpecHandoff?.scene || page.scene || patternScenes[(page.layoutPattern || {}).id] || 'workbench';
-}
-
 function pageHandoff(page, plan) {
   const supplied = page.pageSpecHandoff === undefined ? {} : page.pageSpecHandoff;
   requireFact(object(supplied), `页面 ${page.name} 的 pageSpecHandoff 必须是对象`);
-  const handoffKeys = ['scene', 'pageStructure', 'entryMode', 'navigation', 'contentBlocks', 'dataSources', 'dataBinding', 'emptyReason', 'primaryAction', 'themeSummary', 'designFile', 'designRefs'];
+  const handoffKeys = ['scene', 'pageStructure', 'entryMode', 'contentBlocks', 'dataSources', 'dataBinding', 'emptyReason', 'primaryAction', 'themeSummary', 'designFile', 'designRefs'];
   requireFact(Object.keys(supplied).every(key => handoffKeys.includes(key)), `页面 ${page.name} 的 pageSpecHandoff 包含未知字段`);
-  const scene = sceneForPage(page);
+  const patternScenes = {
+    'data-insight': 'dashboard', 'catalog-browse': 'list', 'brand-landing': 'landing',
+    'progress-narrative': 'detail', 'split-pane-ops': 'detail',
+  };
+  const scene = supplied.scene || page.scene || patternScenes[(page.layoutPattern || {}).id] || 'workbench';
   const structures = {
     workbench: 'workbench', dashboard: 'dashboard-overview', list: 'business-list',
     detail: 'detail-profile', landing: 'official-homepage', screen: 'data-screen',
   };
   const customNavigation = navigationConfig(plan).navigationType === 'custom';
-  const entryMode = supplied.entryMode || page.entryMode || (customNavigation || supplied.navigation ? 'standalone' : 'platform-shell');
+  const entryMode = supplied.entryMode || page.entryMode || (customNavigation ? 'standalone' : 'platform-shell');
   requireFact(!customNavigation || entryMode === 'standalone', `自定义导航的页面 ${page.name} 必须使用 standalone 入口`);
-  if (supplied.navigation !== undefined) {
-    const nav = supplied.navigation;
-    requireFact(object(nav) && Object.keys(nav).every(key => ['type', 'variant', 'reason'].includes(key)), `页面 ${page.name} 的 navigation 必须只描述页面菜单`);
-    requireFact(['custom', 'none'].includes(nav.type), `页面 ${page.name} 的 navigation.type 必须是 custom 或 none`);
-    requireFact(entryMode === 'standalone', `页面 ${page.name} 的独立菜单必须使用 standalone 入口，不能叠加平台导航`);
-    requireFact(nav.type === 'custom' ? ['top', 'side', 'mixed', 'dock'].includes(nav.variant) : nav.variant === undefined, `页面 ${page.name} 的 navigation.variant 与菜单类型不匹配`);
-    requireFact(nonEmpty(nav.reason), `页面 ${page.name} 缺少导航依据`);
-  }
   if (!structures[scene] || !['platform-shell', 'standalone'].includes(entryMode)) {
     throw new CliError(`页面 ${page.name} 的 scene 或 entryMode 无效`, { code: 'DESIGN_PLAN_INVALID_PAGE_HANDOFF' });
   }
@@ -246,9 +224,7 @@ function pageHandoff(page, plan) {
   }
   requireFact(nonEmpty(page.name) && nonEmpty(page.primaryTask) && nonEmpty(page.permissionSummary), '页面缺少名称、核心任务或权限说明');
   requireFact(nonEmpty(supplied.primaryAction || page.primaryTask), `页面 ${page.name} 缺少主操作`);
-  const contentBlocks = supplied.contentBlocks || page.blocks;
-  requireFact(nonEmptyList(contentBlocks) && contentBlocks.every(nonEmpty), `页面 ${page.name} 的内容区块需使用非空文本，或完整的 name/purpose 结构化输入`);
-  requireFact(!Array.isArray(page.blocks) || page.blocks.every(nonEmpty), `页面 ${page.name} 的 blocks 包含未完成的区块说明`);
+  requireFact(nonEmptyList(supplied.contentBlocks || page.blocks), `页面 ${page.name} 缺少内容区块`);
   const sceneKey = page.sceneKey || scene;
   if (!/^[\p{L}\p{N}_-]+$/u.test(sceneKey)) {
     throw new CliError(`页面 ${page.name} 的 sceneKey 无效`, { code: 'DESIGN_PLAN_INVALID_PAGE_HANDOFF' });
@@ -272,24 +248,7 @@ function pageHandoff(page, plan) {
   };
 }
 
-function pageNavigationRows(page, plan) {
-  // Draft previews can display navigation before business details are complete.
-  const handoff = page.pageSpecHandoff || {};
-  const applicationCustom = navigationConfig(plan).navigationType === 'custom';
-  const menu = handoff.navigation;
-  const entryMode = handoff.entryMode || page.entryMode || (applicationCustom || menu ? 'standalone' : 'platform-shell');
-  const variants = { top: '顶部', side: '侧边', mixed: '顶部与侧边', dock: '底部' };
-  return [
-    ['访问方式', entryMode === 'standalone' ? '独立页面入口' : '应用工作区入口'],
-    ['页面菜单', menu ? (menu.type === 'custom' ? `自定义${variants[menu.variant] || ''}菜单` : '不设菜单')
-      : applicationCustom ? '沿用应用自定义菜单' : entryMode === 'standalone' ? '未规划应用菜单，仅实现业务内容' : '沿用平台导航'],
-    ['页面实现边界', entryMode === 'platform-shell' ? '只实现业务内容；同任务分类用页内 Tab，跨模块切换交给平台菜单，不重复自绘管理导航' : '按独立入口方案组织内容，不嵌套平台导航'],
-    ['导航影响范围', applicationCustom ? '应用采用自定义导航' : entryMode === 'standalone' ? '仅当前入口，应用工作区保留平台导航' : '保留平台导航'],
-    ...(menu ? [['选择依据', menu.reason]] : []),
-  ];
-}
-
-function buildExecution(plan, options = {}) {
+function buildExecution(plan) {
   const pages = (plan.pages || {}).customPageDetails || [];
   const models = plan.dataModels || [];
   const { navigationStyle } = visualSelections(plan);
@@ -305,31 +264,13 @@ function buildExecution(plan, options = {}) {
   }
   const interactionStates = {
     empty: '说明当前无数据并提供登记或返回入口', loading: '保留上下文并显示加载状态', error: '显示原因和重试入口',
-    formEntry: '复用原生表单时，PC 使用 50vw 抽屉，移动端整页打开；前台全码填写按页面交互设计接入真实数据，提交后刷新结果',
+    formEntry: 'PC 使用 50vw 抽屉承载原生表单，移动端整页打开；提交后刷新数据',
     detail: '使用真实 formInstId 打开详情；缺少 ID 时禁用入口',
   };
   const resources = [
     ...models.map(model => ({ name: model.name, type: String(model.formType).includes('流程') ? 'process-form' : 'normal-form', purpose: model.description })),
     ...pages.map(page => ({ name: page.name, type: 'display-page', pageId: page.pageId, purpose: page.primaryTask })),
   ];
-  const pageHandoffs = pages.map(page => {
-    const spec = pageHandoff(page, plan);
-    if (options.designFile) {spec.designFile = options.designFile;}
-    return { pageId: page.pageId, name: page.name, sceneKey: page.sceneKey || spec.scene, pageSpecHandoff: spec,
-      navigationPolicy: buildPageNavigationPolicy(spec, navigation.navigationType),
-    };
-  });
-  const defaultAcceptanceCriteria = [
-    ...models.map(model => `${model.name}的字段、必填规则与关系符合数据模型`),
-    ...(plan.businessFlows || []).map(flow => `${flow.name}按触发条件和业务规则执行`),
-    ...pages.map(page => `${page.name}支持${page.primaryTask || page.positioning}`),
-    ...pageHandoffs.filter(page => page.navigationPolicy.applicationMenuOwner === 'platform')
-      .map(page => `${page.name}只实现业务内容，同任务分类可用页内 Tab，跨模块使用平台菜单；实际管理入口无重复导航`),
-    ...(!resourceOnly ? [
-      '应用主题按 design.md 配置，页面消费同一组 token',
-      '核心普通表单示例数据写入并抽查，或说明跳过原因',
-    ] : []),
-  ];
   const handoff = {
     resourceBlueprint: resources,
     resourceCreationOrder: resourceOnly
@@ -337,13 +278,21 @@ function buildExecution(plan, options = {}) {
       : ['应用与主题配置', ...models.map(model => model.name), '初始示例数据', ...pages.map(page => page.name), '发布与导航排序'],
     pageImplementationOrder: pages.map(page => page.pageId || page.name),
     navigationOrder: [],
-    navigationFallback: resourceOnly ? '本轮显式窄范围不执行导航排序' : '全部资源完成后按管理任务统一排序；不自动创建首页或把独立前台置顶',
+    navigationFallback: resourceOnly ? '本轮显式窄范围不执行导航排序' : '发布时使用 --auto-nav-order，不再重复执行排序',
+    acceptanceCriteria: [
+      ...models.map(model => `${model.name}的字段、必填规则与关系符合数据模型`),
+      ...(plan.businessFlows || []).map(flow => `${flow.name}按触发条件和业务规则执行`),
+      ...pages.map(page => `${page.name}支持${page.primaryTask || page.positioning}`),
+      ...(!resourceOnly ? [
+        '应用主题按 design.md 配置，页面消费同一组 token',
+        '核心普通表单示例数据写入并抽查，或说明跳过原因',
+      ] : []),
+    ],
     ...execution,
-    acceptanceCriteria: [...new Set([...defaultAcceptanceCriteria, ...(execution.acceptanceCriteria || [])])],
     interactionStates: { ...interactionStates, ...execution.interactionStates },
     sampleDataPlan: sampleDataPlan(models, execution.sampleDataPlan === undefined ? undefined : JSON.parse(JSON.stringify(execution.sampleDataPlan))),
     appConfig: { appType: '待创建后回填', corpId: '待登录态确认', baseUrl: '待目标环境确认', ...execution.appConfig, ...visualConfig, ...navigation },
-    pages: pageHandoffs,
+    pages: pages.map(page => ({ pageId: page.pageId, name: page.name, pageSpecHandoff: pageHandoff(page, plan) })),
   };
   requireFact(new Set(pages.map(page => page.pageId)).size === pages.length && pages.every(page => nonEmpty(page.pageId)), '页面 pageId 缺失或重复');
   const resourcesByName = new Map(resources.map(resource => [resource.name, resource]));
@@ -361,25 +310,6 @@ function buildExecution(plan, options = {}) {
     }
   }
   requireFact(resources.every(resource => blueprintNames.has(resource.name)), '资源蓝图遗漏业务表单或页面');
-  const entryNavigation = buildEntryNavigation(plan, handoff.resourceBlueprint, handoff.pages);
-  if (entryNavigation) {
-    handoff.entryRecommendation = entryNavigation.recommendation;
-    handoff.entryModeSummary = ENTRY_MODE_SUMMARIES[entryNavigation.recommendation.mode];
-    const skipOrder = resourceOnly || navigation.navigationType === 'custom' || entryNavigation.recommendation.mode === 'frontend-only';
-    if (execution.navigationOrder !== undefined) {
-      requireFact(JSON.stringify(execution.navigationOrder) === JSON.stringify(skipOrder ? [] : entryNavigation.platformOrder), 'navigationOrder 与入口管理菜单冲突，请修改入口菜单这一份源事实');
-    }
-    handoff.navigationOrder = skipOrder ? [] : entryNavigation.platformOrder;
-    handoff.navigationFallback = skipOrder
-      ? (resourceOnly ? '当前窄范围保留无关入口顺序' : '平台排序命令不适用；按各入口 menu 顺序与 defaultMenuKey 实现自定义导航并验证首页')
-      : '按业务管理入口的默认任务和菜单顺序排序平台导航；独立前台按自身 menu 与 defaultMenuKey 落实顺序和首页';
-    if (!resourceOnly) {
-      handoff.acceptanceCriteria.push(entryNavigation.recommendation.mode === 'service-management'
-        ? '分别验证访客、业务管理者及双身份用户的入口、视图、数据范围和操作权限；导航预览不代替真实身份验证'
-        : '按当前入口的实际访问者验证默认任务、视图、数据范围和操作权限；不追加范围外角色或首页');
-      handoff.acceptanceCriteria.push('逐入口核对菜单及分组顺序、默认页面和首屏任务；自定义导航不因跳过平台排序命令而免验，排序回读不替代实际入口验证');
-    }
-  }
   handoff.pageNavigation = [...resources, ...handoff.resourceBlueprint.filter(resource => resource.type === 'report')]
     .filter(resource => navigation.navigationType === 'custom' || handoff.pages.some(page => page.name === resource.name && page.pageSpecHandoff.entryMode === 'standalone'))
     .map(resource => ({ name: resource.name, type: resource.type, isRenderNav: false }));
@@ -389,24 +319,6 @@ function buildExecution(plan, options = {}) {
   return handoff;
 }
 
-function renderEntryNavigation(recommendation) {
-  if (!Array.isArray(recommendation?.entries)) {return [];}
-  const lines = ['### 访问态入口与权限', ENTRY_MODE_SUMMARIES[recommendation.mode], '页面隐藏导航不授予业务权限。', ''];
-  for (const entry of recommendation.entries) {
-    const rows = [];
-    const visit = items => {
-      for (const item of items || []) {
-        if (item.children) {visit(item.children); continue;}
-        rows.push([item.label, item.resource, item.targetType, item.viewUuid || item.viewKey,
-          (item.access || []).map(access => `${access.resource}：${access.operation}；${access.dataScope}`), item.key === entry.defaultMenuKey ? '默认入口' : '']);
-      }
-    };
-    visit(entry.menu);
-    lines.push(`#### ${entry.name}`, '', mdTable(['菜单', '资源', '用途', '视图', '权限依赖', '默认落点'], rows), '');
-  }
-  return lines;
-}
-
 function renderPrd(plan, handoff = buildExecution(plan)) {
   const overview = plan.overview || {};
   const models = plan.dataModels || [];
@@ -435,7 +347,6 @@ function renderPrd(plan, handoff = buildExecution(plan)) {
       ['导航配色', handoff.appConfig.navTheme === 'dark' ? '深色' : '浅色'],
     ]), '',
     '### 页面导航配置', '', mdTable(['页面', '平台页面导航'], handoff.pageNavigation.map(page => [page.name, page.isRenderNav ? '显示' : '隐藏'])), '',
-    ...renderEntryNavigation(handoff.entryRecommendation || plan.execution?.entryRecommendation),
     '## 3. 数据结构（业务语义，不含细节 ID）',
   ];
   for (const model of models) {
@@ -453,7 +364,6 @@ function renderPrd(plan, handoff = buildExecution(plan)) {
       ['内容优先级', page.contentPriority], ['功能区块', page.blocks], ['首屏结构', page.firstScreenStructure],
       ['标志性交互', page.signatureInteraction], ['页面模式', page.layoutPattern], ['信息密度', page.density],
       ['内容丰富度', page.contentRichness], ['权限说明', page.permissionSummary],
-      ...pageNavigationRows(page, plan),
       ...Object.entries(handoff.pages[index].pageSpecHandoff),
     ]));
   });
@@ -485,332 +395,367 @@ function normalizeHex(value) {
   return match ? `#${match[1].toUpperCase()}` : null;
 }
 
+function mixHex(hex, target, targetRatio) {
+  const source = [1, 3, 5].map(index => parseInt(hex.slice(index, index + 2), 16));
+  const mixed = source.map((channel, index) => Math.round(channel * (1 - targetRatio) + target[index] * targetRatio));
+  return `#${mixed.map(channel => channel.toString(16).padStart(2, '0')).join('').toUpperCase()}`;
+}
+
+function mixTwoHex(left, right, rightRatio) {
+  const target = [1, 3, 5].map(index => parseInt(right.slice(index, index + 2), 16));
+  return mixHex(left, target, rightRatio);
+}
+
+function hexToRgba(hex, alpha) {
+  const channels = [1, 3, 5].map(index => parseInt(hex.slice(index, index + 2), 16));
+  return `rgba(${channels.join(', ')}, ${alpha})`;
+}
+
+function replaceTokenValue(source, token, value) {
+  const tokenPattern = token.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return source.replace(new RegExp(`("${tokenPattern}"\\s*:\\s*)"[^"]*"`), `$1"${value}"`);
+}
+
+function deriveBrandColors(primaryColor, themeId) {
+  if (themeId === 'dark-luminous-modular') {
+    return {
+      '--color-brand1-1': mixHex(primaryColor, [255, 255, 255], 0.10),
+      '--color-brand1-2': mixTwoHex(primaryColor, '#181818', 0.76),
+      '--color-brand1-3': mixTwoHex(primaryColor, '#101010', 0.90),
+      '--color-brand1-5': mixHex(primaryColor, [0, 0, 0], 0.18),
+      '--color-brand1-9': mixHex(primaryColor, [0, 0, 0], 0.10),
+      '--color-brand1-10': mixTwoHex(primaryColor, '#181818', 0.58),
+    };
+  }
+  const defaults = {
+    brand1: 0.12,
+    brand2: 0.88,
+    brand3: 0.94,
+    brand5: 0.18,
+    brand9: 0.12,
+    brand10: 0.62,
+  };
+  const profiles = {
+    'airy-media-grid': { brand1: 0.14, brand3: 0.95, brand5: 0.16, brand9: 0.10, brand10: 0.64 },
+    'ambient-halo-layered': { brand1: 0.14, brand9: 0.10, brand10: 0.64 },
+    'hairline-runway-clarity': { brand1: 0.90, brand2: 0.82, brand3: 0.74, brand10: 0.70 },
+    'media-rail-inspector': { brand1: 0.90, brand2: 0.82, brand3: 0.74, brand10: 0.68 },
+    'mist-layered-signal': { brand1: 0.14, brand5: 0.16, brand9: 0.10, brand10: 0.64 },
+    'modular-rail-signal': { brand1: 0.14, brand9: 0.10, brand10: 0.64 },
+    'mono-grid-signal': { brand1: 0.90, brand2: 0.82, brand3: 0.74, brand10: 0.68 },
+    'ribbon-ledger-lift': { brand1: 0.90, brand2: 0.82, brand3: 0.74, brand5: 0.16, brand10: 0.68 },
+    'segmented-meter-clarity': { brand1: 0.90, brand2: 0.82, brand3: 0.74, brand10: 0.66 },
+    'status-framed-media-grid': { brand1: 0.08, brand9: 0.10, brand10: 0.72 },
+  };
+  const profile = { ...defaults, ...(profiles[themeId] || {}) };
+  return {
+    '--color-brand1-1': mixHex(primaryColor, [255, 255, 255], profile.brand1),
+    '--color-brand1-2': mixHex(primaryColor, [255, 255, 255], profile.brand2),
+    '--color-brand1-3': mixHex(primaryColor, [255, 255, 255], profile.brand3),
+    '--color-brand1-5': mixHex(primaryColor, [0, 0, 0], profile.brand5),
+    '--color-brand1-9': mixHex(primaryColor, [0, 0, 0], profile.brand9),
+    '--color-brand1-10': mixHex(primaryColor, [255, 255, 255], profile.brand10),
+  };
+}
+
+function deriveThemeColors(primaryColor, themeId) {
+  const themes = {
+    'high-contrast-modular': {
+      '--oyd-surface-soft': mixTwoHex(primaryColor, '#F1F1F1', 0.95),
+      '--oyd-accent-deep': mixTwoHex(primaryColor, '#202020', 0.55),
+    },
+    'interlocked-vivid-modules': {
+    },
+    'media-rail-inspector': {
+      '--oyd-media-surface': mixTwoHex(primaryColor, '#F7F7F7', 0.96),
+      '--oyd-tag-surface': mixTwoHex(primaryColor, '#F2F2F2', 0.92),
+      '--oyd-action-deep': mixTwoHex(primaryColor, '#151515', 0.86),
+    },
+    'mono-grid-signal': {
+      '--oyd-pattern-surface': mixTwoHex(primaryColor, '#F3F3F3', 0.92),
+    },
+    'status-framed-media-grid': {
+      '--oyd-brand-focus-soft': mixTwoHex(primaryColor, '#FFFFFF', 0.92),
+    },
+    'dark-luminous-modular': {
+      '--oyd-brand-glow-soft': hexToRgba(primaryColor, 0.18),
+      '--oyd-brand-chart-strong': mixHex(primaryColor, [255, 255, 255], 0.06),
+      '--oyd-brand-chart-muted': hexToRgba(primaryColor, 0.46),
+      '--oyd-brand-chart-area': hexToRgba(primaryColor, 0.14),
+    },
+  };
+  return themes[themeId] || {};
+}
+
+function deriveSurfacePalette(primaryColor, surfaceTone, template) {
+  if (!['theme', 'brand-tinted'].includes(surfaceTone)) {
+    throw new CliError('colorStrategy.surfaceTone 必须是 theme 或 brand-tinted', { code: 'DESIGN_PLAN_INVALID_SURFACE_TONE' });
+  }
+  const surface = normalizeHex(readDesignTokens(template)['--color-white']);
+  // 深色表面保持其既有明度层级，不能因为品牌配色而变成白卡。
+  const darkSurface = surface && [1, 3, 5].every(index => parseInt(surface.slice(index, index + 2), 16) < 128);
+  if (surfaceTone !== 'brand-tinted' || darkSurface) {return {};}
+  return {
+    // 品牌氛围属于 Shell；原生页面和 Canvas 共用页面底色，不受导航归属影响。
+    '--pod-shell-bg-color-light': mixHex(primaryColor, [255, 255, 255], 0.94),
+    '--pod-card-bg-color': 'var(--color-white, #fff)',
+    '--color-fill1-1': mixHex(primaryColor, [255, 255, 255], 0.97),
+    '--color-fill1-2': mixHex(primaryColor, [255, 255, 255], 0.91),
+    '--color-fill1-3': mixHex(primaryColor, [255, 255, 255], 0.84),
+    '--color-line1-1': mixHex(primaryColor, [255, 255, 255], 0.86),
+    '--color-line1-2': mixHex(primaryColor, [255, 255, 255], 0.76),
+    '--pod-card-border': '1px solid var(--color-line1-1)',
+  };
+}
+
 function resolveTheme(plan) {
   const { selectedTheme: selected } = visualSelections(plan);
-  const index = loadThemeIndex();
+  const index = readJson(THEME_INDEX_PATH, '主题索引');
   const theme = (index.themes || []).find(item => item.themeId === selected.themeId);
-  if (!theme || (theme.templatePath !== selected.templatePath && (!theme.legacyTemplatePath || theme.legacyTemplatePath !== selected.templatePath))) {
+  if (!theme || theme.templatePath !== selected.templatePath) {
     throw new CliError('selectedTheme 的 themeId 与 templatePath 不属于主题索引中的同一记录', {
       code: 'DESIGN_PLAN_THEME_MISMATCH',
       details: { selectedTheme: selected },
     });
   }
   assertThemeProfile(plan.visualStyle?.forUser?.themeProfile, theme);
-  const templatePath = themeTemplatePath(theme);
+  const templatePath = path.resolve(PLAN_SKILL_ROOT, selected.templatePath);
+  if (!templatePath.startsWith(`${THEME_DIR}${path.sep}`) || !fs.existsSync(templatePath)) {
+    throw new CliError(`主题模板不可读：${selected.templatePath}`, {
+      code: 'DESIGN_PLAN_THEME_UNREADABLE',
+    });
+  }
   return { theme, templatePath };
 }
 
-function pageAnchor(pageId) {
-  return `page-${Buffer.from(String(pageId), 'utf8').toString('hex')}`;
-}
-
-function renderProjectFacts(plan, visualDirection, color) {
+function renderProjectVisualSection(visualDirection, color, navigationStyle, navigation) {
+  const navigationToken = navigationStyle.tone === 'dark'
+    ? '--color-brand1-5'
+    : '--color-brand1-3';
   return [
-    '### 项目视觉选择与事实', '',
+    '## 项目视觉选择',
+    '',
     `- 视觉方向：${text(visualDirection.label)}`,
     `- 方向说明：${text(visualDirection.description)}`,
     `- 主题色：${text(color.primaryColorName)} \`${text(color.primaryColor)}\``,
-    `- 业务领域：${text(plan.meta?.businessDomain)}`,
-    `- 产品形态：${text(plan.meta?.experienceTopology)}`,
-    `- 主题应用与前后台边界：${text(plan.visualStyle?.forDesignMd?.productTopologyApplication)}`,
-    `- 已确认视觉约束：${text(plan.visualStyle?.constraints, '无额外约束')}`,
+    `- 导航类型：${NAVIGATION_TYPES[navigation.navigationType].label}`,
+    `- 导航明暗：${navigationToneLabel(navigationStyle.tone)}`,
+    `- 导航背景：\`${navigationToken}\``,
+    `- 选择依据：${text(navigationStyle.selectionReason || visualDirection.description)}`,
   ].join('\n');
 }
 
-function renderNavigationDesign(plan, navigationStyle, tokens) {
-  const roles = {
-    '--pod-shell-theme-bg-color': '导航背景', '--pod-nav-item-text-color': '普通文字',
-    '--pod-nav-item-text-hover-color': '悬停文字', '--pod-nav-item-text-selected-color': '选中文字',
-    '--pod-nav-menu-bg-hover-color': '悬停背景', '--pod-nav-menu-bg-selected-color': '选中背景',
-    '--pod-page-header-bg-color': '页头背景', '--pod-nav-logo-text': '应用名称',
-    '--pod-nav-l-group-label-color': '分组文字', '--pod-nav-sub-divider-color': '分组边界',
-    '--pod-nav-search-bg-color': '搜索背景', '--pod-nav-search-text-color': '搜索文字',
-    '--pod-nav-popup-bg-color': '弹层背景', '--pod-nav-popup-border-radius': '弹层圆角',
-    '--pod-nav-menu-item-height': '菜单高度', '--pod-nav-menu-item-radius': '菜单圆角',
-    '--pod-nav-menu-item-border': '普通边框', '--pod-nav-menu-item-hover-border': '悬停边框',
-    '--pod-nav-menu-item-selected-border': '选中边框', '--pod-nav-menu-item-padding': '菜单内距',
-    '--pod-nav-menu-font-size': '菜单字号', '--pod-nav-menu-line-height': '菜单文字行高', '--pod-nav-menu-gap': '菜单间距',
-    '--pod-nav-menu-item-selected-shadow': '选中项阴影',
-    '--pod-nav-slide-aside-gap': '侧栏分区间距', '--pod-nav-slide-aside-padding': '侧栏内距',
-    '--pod-nav-platform-header-height': '顶部框架高度', '--pod-nav-top-header-padding': '顶栏内距',
-    '--pod-nav-top-tab-height': '顶部菜单高度', '--pod-nav-top-tab-item-padding': '顶部菜单内距',
-    '--pod-nav-top-tab-item-max-width': '顶部菜单最大宽度',
-    '--pod-nav-l-header-padding': 'L 型顶栏内距', '--pod-nav-l-aside-padding': 'L 型侧栏内距',
-    '--pod-shell-lshape-border-radius': '框架圆角',
-  };
-  // Layout reasons can come from an older visual choice. Keep their business
-  // clauses while stating the current navigation tone separately.
-  const reason = navigationStyle.toneSource === 'theme_derived'
-    ? String(navigationStyle.selectionReason || '').split(/[，,；;。]/)
-      .filter(clause => !/(?:深色|浅色|暗色|亮色|黑色|白色).*(?:导航|菜单|侧栏)|(?:导航|菜单|侧栏).*(?:深色|浅色|暗色|亮色|黑色|白色)|(?:dark|light).*(?:nav|menu|sidebar)|(?:nav|menu|sidebar).*(?:dark|light)/i.test(clause))
-      .filter(clause => clause.trim()).join('；')
-    : navigationStyle.selectionReason;
-  return [
-    '#### 本项目导航与应用框架', '',
-    `- 导航类型：${NAVIGATION_TYPES[navigationConfig(plan).navigationType].label}`,
-    `- 导航明暗：${navigationToneLabel(navigationStyle.tone)}`,
-    '- 导航背景：`--pod-shell-theme-bg-color`（最终值见 tokens）',
-    `- 布局依据：${text(reason, '按业务入口、模块层级和切换频率安排菜单')}`,
-    `- 明暗依据：${navigationStyle.toneSource === 'theme_derived' ? '沿用已选应用风格的导航明暗' : '采用本项目明确设计的导航明暗'}，当前为${navigationToneLabel(navigationStyle.tone)}。`, '',
-    '- 导航、表单、自定义页面和记录详情共用本项目设计；完整导航状态与尺寸见 tokens.application-global.appearance.navigation。', '',
-    mdTable(['角色', '变量', '本项目取值'], Object.entries(roles).filter(([name]) => tokens[name]).map(([name, role]) => [role, name, tokens[name]])), '',
-    ...(plan.pages?.customPageDetails || []).map(page => [
-      `#### ${text(page.name)}的导航`, '', mdTable(['项目', '方案'], pageNavigationRows(page, plan)),
-    ].join('\n')),
-  ].join('\n');
+function injectAfterFrontmatter(source, content) {
+  const frontmatter = /^---\n[\s\S]*?\n---\n/;
+  if (!frontmatter.test(source)) {
+    return `${content}\n\n${source}`;
+  }
+  return source.replace(frontmatter, match => `${match}\n${content}\n\n`);
+}
+
+function renderPagePatterns(pages) {
+  return (pages.customPageDetails || []).map(page => {
+    const pattern = page.layoutPattern || {};
+    const richness = page.contentRichness || {};
+    return [
+      `#### ${text(page.name)}`,
+      '',
+      `- 模式：${text(pattern.mode)} / ${text(pattern.id)}`,
+      `- 选择原因：${text(pattern.reason)}`,
+      `- 调整项：${text(pattern.adaptations)}`,
+      `- 必须保留：${text(pattern.mustKeep)}`,
+      `- 信息密度：${text(page.density)}`,
+      `- 内容覆盖：${text(richness.contentLayers)}`,
+    ].join('\n');
+  }).join('\n\n') || '- 无自定义页面';
 }
 
-function renderPageApplications(plan, tokens) {
-  const applications = plan.visualStyle?.forUser?.pageApplications || [];
-  const pages = plan.pages?.customPageDetails || [];
-  return pages.map(page => {
-    const application = applications.find(item => item.pageId === page.pageId) || {};
+function renderPageApplications(applications) {
+  return (applications || []).map(application => {
     const memories = (application.visualMemoryApplications || []).map(memory =>
-      `${text(memory.name)}用于${text(memory.target)}（${text(memory.reason)}）`).join('；');
-    const checks = Array.isArray(application.acceptanceChecks) ? application.acceptanceChecks : [];
+      `  - ${text(memory.name)}：${text(memory.target)}（${text(memory.renderPolicy)}；${text(memory.reason)}）`
+    );
     return [
-      `<a id="${pageAnchor(page.pageId)}"></a>`,
-      `### ${text(page.name)}`, '',
-      `- 页面任务：${text(page.primaryTask)}。内容覆盖：${text(page.contentRichness?.contentLayers || page.blocks)}`,
-      `- 首屏焦点：${text(application.firstScreenFocus, '草稿待补充')}`,
-      `- 布局：${text(application.layout, '草稿待补充')}；页面模式 ${text(page.layoutPattern?.id)}，信息密度 ${text(page.density)}`,
-      `- 表面与组件：画布使用 --pod-page-bg-color（${tokens['--pod-page-bg-color']}），主容器使用 --pod-card-bg-color（${tokens['--pod-card-bg-color']}），边界使用 --color-line1-1（${tokens['--color-line1-1']}）。${text(application.surface)}${memories ? `；${memories}` : ''}`,
+      `#### ${text(application.pageName || application.pageId)}`,
+      '',
+      `- 视觉应用：${text(application.visualApplication)}`,
+      `- 表面：${text(application.surface)}`,
       `- 主操作：${text(application.primaryAction)}`,
       `- 状态：${text(application.states)}`,
-      `- 响应式：${text(application.responsive, '草稿待补充')}`,
-      `- 验收：${checks.length ? checks.join('；') : '草稿待补充'}`,
+      '- 视觉记忆点：',
+      ...(memories.length > 0 ? memories : ['  - 无匹配内容，不虚构视觉组件']),
     ].join('\n');
-  }).join('\n\n') || '本项目使用原生表单与平台页面，没有自定义页面设计。';
+  }).join('\n\n') || '- 无自定义页面';
 }
 
-function themeImplementationRules(chapter) {
-  const headings = [...chapter.matchAll(/^### ([^\n]+)\n/gm)];
-  const result = [];
-  for (const [index, heading] of headings.entries()) {
-    if (heading[1] === '项目页面设计') {continue;}
-    const content = chapter.slice(heading.index + heading[0].length, headings[index + 1]?.index).trim();
-    if (heading[1] === '页面设计验收') {
-      result.push(`### 主题表达验收\n\n${content}`);
-      continue;
-    }
-    // These source paragraphs mix durable rendering constraints with instructions
-    // for authoring/instantiating templates. Retain the former sentence by sentence.
-    const filtered = content.split('\n').map(line => {
-      const bullet = /^- /.test(line) ? '- ' : '';
-      const sentences = line.replace(/^- /, '').split(/(?<=[。；;])\s*/u);
-      const keep = sentences.filter(sentence => !/themeId|front matter|sRGB|round\(|线性光|生成标记|生成期|占位|四舍五入|输出六位十六进制|用户未提供|用户已指定|未指定时|缺少输入|没有可用种子|由项目流程中的 AI|按依赖顺序计算|先解析唯一主色/.test(sentence));
-      const text = keep.join('');
-      return text.trim() ? bullet + text : '';
-    }).join('\n').replace(/\n{3,}/g, '\n\n').trim();
-    if (filtered) {result.push(`### ${heading[1].replace(/实例化$/, '职责与约束')}\n\n${filtered}`);}
-  }
-  return result.join('\n\n');
-}
-
-function renderProjectApplications(plan, tokens, color, chapter) {
-  const assets = plan.visualStyle?.forUser?.assetStrategy || { pages: [] };
-  const colors = {
-    '--color-brand1-6': '主色与主要品牌操作', '--color-brand1-1': '品牌悬停',
-    '--color-brand1-9': '品牌按下', '--color-brand1-10': '品牌禁用',
-    '--pod-page-bg-color': '页面画布', '--pod-card-bg-color': '内容容器',
-    '--color-fill1-5': '独立浮层', '--color-fill1-10': 'Tooltip背景', '--color-text1-5': 'Tooltip前景',
-  };
-  return [
-    '## 5. 项目应用与调整规则', '',
-    themeImplementationRules(chapter), '',
-    '### 本项目实现边界', '',
-    '本项目显式 Token 与页面决定优先于默认值；原生导航采用第二章的导航设计和完整导航 token，自绘导航按本项目入口方案实施。导航、应用框架、表单、自定义页面与详情保持统一风格。业务内容、操作和数据来自 PRD，条件配方用于本项目已有内容。',
-    `已确认约束：${text(plan.visualStyle?.constraints, '无额外约束')}。`, '',
-    '### 配色与语义', '',
-    `本项目主色为 ${text(color.primaryColorName, '')} ${color.primaryColor}；来源为 ${text(color.source, 'AI 推断')}。${text(color.usage, '用于主要品牌操作和少量焦点，独立数据色和平台状态色保持各自语义。')}`, '',
-    mdTable(['语义', '变量', '最终取值'], Object.entries(colors).filter(([name]) => tokens[name]).map(([name, role]) => [role, name, tokens[name]])), '',
-    renderPageApplications(plan, tokens), '',
-    '### 素材与实现验收', '',
-    ...(assets.pages || []).map(page => `- ${text(page.pageId)}：${text(page.imageNeed, 'none')}；${text(page.reason)}；素材槽位 ${(page.slots || []).map(slot => slot.slotId || slot.slotKey || slot.key || slot.name).filter(Boolean).join('、') || '无'}`),
-    `素材缺口：${text(assets.missingAssets, '无')}。`,
-    '- 验证页面任务、首屏焦点、布局和窄屏顺序与逐页方案一致；条件配方只出现在已注明的位置。',
-    '- 验证表面层级、操作与文字对比、键盘焦点、空态和错误反馈；数据几何、单位和读数须与真实数据一致。',
-  ].join('\n');
+function assetSummary(assetStrategy) {
+  const strategy = assetStrategy || {};
+  const pages = Array.isArray(strategy.pages) ? strategy.pages : [];
+  return pages.map((page) => {
+    const slotCount = Array.isArray(page.slots) ? page.slots.length : 0;
+    return `${page.pageId || '未命名页面'}: ${page.imageNeed || 'none'}，${slotCount} 个槽位`;
+  }).join('；') || '无图片需求';
 }
 
-function componentReferences(body) {
-  const match = /^## 3\. 基础组件表达\n([\s\S]*?)(?=^## |$(?![\s\S]))/m.exec(body);
+function componentReferences(markdown) {
+  const sections = [...markdown.matchAll(/^### (.+)\n([\s\S]*?)(?=^#{1,3} |$(?![\s\S]))/gm)];
+  const patterns = { button: /按钮/, input: /输入/, card: /卡片/, table: /表格/, chart: /图表/ };
   const components = {};
+  for (const [key, pattern] of Object.entries(patterns)) {
+    const section = sections.find(match => pattern.test(match[1]));
+    if (section) {components[key] = { rules: section[2].trim() };}
+  }
   const states = {};
-  if (!match) {return { body, components, states };}
-  const section = match[1];
-  const start = match.index + match[0].indexOf(section);
-  const headings = [...section.matchAll(/^### (.+)\n/gm)];
-  const subsections = headings.map((heading, index) => ({ index: heading.index, title: heading[1],
-    content: section.slice(heading.index + heading[0].length, headings[index + 1]?.index) }));
-  const anchors = new Map();
-  const locate = (anchor, target) => {
-    const position = start + target.index;
-    anchors.set(position, [...(anchors.get(position) || []), `<a id="${anchor}"></a>`]);
-  };
-  for (const [key, pattern] of Object.entries({ button: /按钮|主操作|次操作/, input: /输入|搜索|筛选控件/, card: /卡片|面板|容器/, table: /表格|表头|单元格/, chart: /图表|图形|曲线|柱形/ })) {
-    const target = subsections.find(item => pattern.test(item.title)) || subsections.find(item => pattern.test(item.content));
-    if (!target) {continue;}
-    const anchor = `component-${key}`;
-    components[key] = { anchor: `#${anchor}` };
-    locate(anchor, target);
-  }
-  const stateSection = subsections.find(item => /^(?:\d+\.\d+ )?(?:组件状态|交互状态|交互与反馈状态|状态与)/.test(item.title))
-    || subsections.find(item => /状态/.test(item.title));
-  for (const [key, pattern] of Object.entries({ empty: /empty|空态|无数据|暂无/, loading: /loading|加载/, error: /error|错误|失败|异常/,
-    disabled: /disabled|禁用/, focus: /focus|聚焦|焦点|键盘/, selected: /selected|选中/ })) {
-    const target = stateSection && pattern.test(stateSection.content) ? stateSection : subsections.find(item => pattern.test(item.content));
-    if (!target) {continue;}
-    const anchor = `state-${key}`;
-    states[key] = { anchor: `#${anchor}` };
-    locate(anchor, target);
-  }
-  let output = body;
-  for (const [position, tags] of [...anchors].sort((left, right) => right[0] - left[0])) {
-    output = output.slice(0, position) + `${tags.join('\n')}\n` + output.slice(position);
-  }
-  return { body: output, components, states };
-}
-
-function overrideTokens(groups, overrides) {
-  const remaining = new Set(Object.keys(overrides));
-  function update(node) {
-    for (const [key, value] of Object.entries(node || {})) {
-      if (key.startsWith('--') && remaining.has(key)) {node[key] = overrides[key]; remaining.delete(key);}
-      else if (value && typeof value === 'object' && !Array.isArray(value)) {update(value);}
+  const section = sections.find(match => /状态与交互/.test(match[1]));
+  if (section) {
+    for (const key of ['empty', 'loading', 'error', 'disabled', 'focus', 'selected']) {
+      states[key] = { rules: section[2].trim() };
     }
   }
-  update(groups);
-  for (const key of remaining) {
-    const scope = /^(?:--pod-|--color-|--font-|--s-|--corner-|--shadow-)/.test(key) ? 'application-global' : 'custom-page';
-    groups[scope] = groups[scope] || {};
-    const target = scope === 'application-global' ? (groups[scope].appearance = groups[scope].appearance || {}) : groups[scope];
-    target['project-overrides'] = target['project-overrides'] || {};
-    target['project-overrides'][key] = overrides[key];
-  }
+  return { components, states };
 }
 
-function renderDesign(plan, options = {}) {
-  const { theme, templatePath } = resolveTheme(plan);
+function renderDesign(plan) {
+  const { templatePath } = resolveTheme(plan);
+  const template = fs.readFileSync(templatePath, 'utf8');
   const meta = plan.meta || {};
   const { visual, forUser, selectedTheme: selected, visualDirection, navigationStyle } = visualSelections(plan);
+  const forDesignMd = visual.forDesignMd || {};
   const color = forUser.colorStrategy || {};
   if (!['top', 'side'].includes(navigationStyle.structure)) {
-    throw new CliError('visualStyle.forUser.navigationStyle.structure 必须是 top 或 side', { code: 'DESIGN_PLAN_INVALID_NAVIGATION_STRUCTURE' });
+    throw new CliError('visualStyle.forUser.navigationStyle.structure 必须是 top 或 side', {
+      code: 'DESIGN_PLAN_INVALID_NAVIGATION_STRUCTURE',
+    });
   }
   if (!['light', 'dark'].includes(navigationStyle.tone)) {
-    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', { code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE' });
+    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', {
+      code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE',
+    });
   }
   const primaryColor = normalizeHex(color.primaryColor);
   if (!primaryColor) {
     throw new CliError('visualStyle.forUser.colorStrategy.primaryColor 必须是 6 位 HEX 色值', {
-      code: 'DESIGN_PLAN_INVALID_PRIMARY_COLOR', details: { primaryColor: color.primaryColor },
+      code: 'DESIGN_PLAN_INVALID_PRIMARY_COLOR',
+      details: { primaryColor: color.primaryColor },
     });
   }
-  // Parse template metadata before inserting user text; YAML quoting belongs to
-  // the common serializer, not string interpolation inside template quotes.
-  const source = resolveThemeColors(fs.readFileSync(templatePath, 'utf8').replace(/\{\{PRIMARY_COLOR\}\}/g, primaryColor));
-  const parsed = parseDesignDocument(source);
-  const themeTokens = readDesignTokens(source);
-  const explicitTokens = visual.tokens || {};
-  if (theme.mode === 'creative') {
-    require('../app/application-style').validateCreativeDirection(visual.creativeDirection, explicitTokens);
+  const replacements = {
+    PROJECT_NAME: text(meta.appName || meta.projectName, 'OpenYida 应用'),
+    BUSINESS_DOMAIN: text(meta.businessDomain),
+    EXPERIENCE_TOPOLOGY: text(meta.experienceTopology),
+    THEME_SOURCE: text(forUser.styleSource || selected.source),
+    PRIMARY_COLOR: primaryColor,
+    COLOR_SOURCE: text(color.source),
+    PROJECT_CONSTRAINTS: text(visual.constraints, '无额外约束'),
+    PRODUCT_TOPOLOGY_APPLICATION: text(forDesignMd.productTopologyApplication),
+    PAGE_PATTERN_SUMMARY: renderPagePatterns(plan.pages || {}),
+    PAGE_APPLICATIONS: renderPageApplications(forUser.pageApplications),
+    PAGE_IMAGE_NEEDS: assetSummary(forUser.assetStrategy),
+    ASSET_GAPS: text((forUser.assetStrategy || {}).missingAssets, '无'),
+  };
+  let output = template.replace(/\{\{([A-Z_]+)\}\}/g, (match, key) => {
+    if (!Object.prototype.hasOwnProperty.call(replacements, key)) {
+      return match;
+    }
+    return replacements[key];
+  });
+  output = output.replace(/^themeId:\s*[^\n]+\n?/m, '');
+  if (!/^buildPlanRevision:/m.test(output)) {
+    output = output.replace(
+      /^---\n/,
+      `---\nbuildPlanRevision: "${text(meta.revision, 'unversioned')}"\n`
+    );
+  }
+  output = injectAfterFrontmatter(
+    output,
+    renderProjectVisualSection(visualDirection, color, navigationStyle, navigationConfig(plan))
+  );
+  const derived = {
+    ...deriveBrandColors(primaryColor, selected.themeId),
+    '--oyd-stage-bottom': mixTwoHex(primaryColor, '#121212', 0.72),
+    '--oyd-heat-1': mixHex(primaryColor, [255, 255, 255], 0.92),
+    '--oyd-heat-2': mixHex(primaryColor, [255, 255, 255], 0.80),
+    '--oyd-heat-3': mixHex(primaryColor, [255, 255, 255], 0.62),
+    '--oyd-heat-4': mixHex(primaryColor, [255, 255, 255], 0.32),
+    '--oyd-heat-5': primaryColor,
+    '--oyd-chart-stripe': mixHex(primaryColor, [0, 0, 0], 0.08),
+    '--oyd-chart-pale': mixHex(primaryColor, [255, 255, 255], 0.84),
+    ...deriveThemeColors(primaryColor, selected.themeId),
+  };
+  for (const [token, value] of Object.entries(derived)) {
+    output = replaceTokenValue(output, token, value);
   }
+  // 页面底色统一使用平台 token；导航形态不改变底色，项目显式设计仍优先。
+  if (!selected.themeId.startsWith('dark-')) {
+    output = replaceTokenValue(output, '--pod-page-bg-color', 'var(--color-white, #fff)');
+  }
+  const explicitTokens = visual.tokens || {};
   if (typeof explicitTokens !== 'object' || Array.isArray(explicitTokens)) {
     throw new CliError('visualStyle.tokens 必须是 CSS token 对象', { code: 'DESIGN_PLAN_INVALID_TOKENS' });
   }
-  if (theme.mode !== 'creative' && themeNavTheme(theme) !== navigationStyle.tone) {
-    throw new CliError('navigationStyle.tone 必须由所选主题模板的 navTheme 派生', {
-      code: 'DESIGN_PLAN_NAVIGATION_TONE_MISMATCH',
-      details: { themeId: theme.themeId, expected: themeNavTheme(theme), actual: navigationStyle.tone },
-    });
-  }
-  const overrides = { ...explicitTokens };
+  const palette = deriveSurfacePalette(primaryColor, color.surfaceTone || 'theme', output);
+  const overrides = { ...palette, ...explicitTokens };
+  const tokens = readDesignTokens(output);
   for (const [token, value] of Object.entries(overrides)) {
     if (!/^--[\w-]+$/.test(token) || /^--color-brand/.test(token) || typeof value !== 'string') {
       throw new CliError(`无效视觉 token：${token}；品牌色由 primaryColor 推导`, { code: 'DESIGN_PLAN_INVALID_TOKENS' });
     }
-  }
-  overrideTokens(parsed.metadata.tokens, overrides);
-  const tokens = { ...themeTokens, ...overrides };
-  const name = text(meta.appName || meta.projectName, 'OpenYida 应用');
-  const colorSource = color.source || forUser.styleSource || selected.source || 'AI 推断';
-  const headings = [...parsed.body.matchAll(/^## ([1-5])\. [^\n]+\n/gm)];
-  const chapters = headings.map((heading, index) => parsed.body.slice(heading.index, headings[index + 1]?.index).trim());
-  if (chapters.length !== 5) {
-    throw new CliError('主题缺少五章设计结构，请检查模板', { code: 'DESIGN_PLAN_THEME_CONTEXT_MISSING' });
-  }
-  const summaryTitle = new RegExp('(^## 1\\. 风格摘要\\n\\s*)\\*\\*([^\\n]+)\\*\\*[ \\t]*\\n(?:[ \\t]*\\n)?', 'm');
-  chapters[0] = chapters[0].replace(summaryTitle,
-    (line, heading, title) => title.includes(theme.label) || title.includes(theme.themeId) ? heading : line);
-  chapters[0] += `\n\n${renderProjectFacts(plan, visualDirection, { ...color, primaryColor })}`;
-  if (theme.mode === 'creative') {
-    const decision = visual.creativeDirection;
-    chapters[0] += `\n\n### 业务推演依据\n\n${decision.businessRationale}`;
-    chapters[1] += `\n\n### 自主设计决策\n\n${decision.composition}\n\n${decision.typography}\n\n${decision.material}`;
-    chapters[2] += `\n\n### 表单布局决策\n\n${decision.formLayout}`;
-  }
-  chapters[1] = chapters[1].replace(/^(### 2\.2 应用导航\n)([\s\S]*?)(?=^### |(?![\s\S]))/m,
-    (_, heading, guidance) => {
-      // The resolved project values replace the preset's color description;
-      // keep its token consumption, interaction and acceptance guidance.
-      const sharedGuidance = (theme.navigationSummary ? guidance.replace(theme.navigationSummary, '') : guidance)
-        .replace(/^导航示例：[^\n]*\n?/gm, '')
-        .replace(/当前模板使用 contentTone:\s*(?:light|dark)、navTheme:\s*(?:light|dark)。/g, '').trim();
-      return `${heading}\n${renderNavigationDesign(plan, navigationStyle, tokens)}\n\n${sharedGuidance}\n\n`;
+    tokens[token] = value;
+  }
+  // Preserve template grouping; only project token values and missing declarations change.
+  output = output.replace(/^tokens:\s*\n[\s\S]*?(?=^[^\s#]|$(?![\s\S]))/m, block => {
+    const existing = new Set();
+    const updated = block.replace(/^(\s*)["']?(--[\w-]+)["']?\s*:[^\n]*$/gm, (line, indent, name) => {
+      existing.add(name);
+      return name in overrides ? `${indent}${JSON.stringify(name)}: ${JSON.stringify(tokens[name])}` : line;
     });
-  const themeGuidance = fs.readFileSync(THEME_CONSISTENCY_PATH, 'utf8');
-  for (const section of ['指标卡与按钮配色', '分组标题与分割线']) {
-    const guidance = themeGuidance.match(new RegExp(`(?:^|\\n)(## ${section}\\n[\\s\\S]*?)(?=\\n## |$)`))?.[1];
-    if (!guidance) {
-      throw new CliError(t('design_document.invalid', THEME_CONSISTENCY_PATH, '## ' + section), {
-        code: 'DESIGN_PLAN_THEME_CONTEXT_MISSING', details: { section },
-      });
-    }
-    chapters[1] += '\n\n' + guidance.trim().replace(/^## /, '### ');
-  }
-  chapters[2] += '\n\n### 图标与相邻底色\n\n图标前景和底盒分别取色，按上述配色规则检查对比度。颜色配对记录在 iconSystem.colorPairs，页面按同一变量实现，并检查颜色继承、描边和透明度。';
-  if (plan.pages?.customPageDetails?.length) {
-    chapters[1] += '\n\n' + fs.readFileSync(PAGE_CONTINUITY_PATH, 'utf8').trim().replace(/^(#{1,5}) /gm, '#$1 ');
+    const extra = Object.entries(overrides).filter(([name]) => !existing.has(name));
+    return updated + extra.map(([name, value]) => `  ${JSON.stringify(name)}: ${JSON.stringify(value)}\n`).join('');
+  });
+  if (Object.keys(palette).length) {
+    output = injectAfterFrontmatter(output, [
+      '## 项目配色适配（优先于模板默认配色）', '',
+      `用户选择的 ${text(color.primaryColorName, primaryColor)} 用于整体浅色氛围。Shell 浅色背景、填充和边界已按同一主色派生，项目显式 token 覆盖优先；最终取值以本文 tokens 为准。`,
+      '背景分层：Shell 承载外层氛围；原生页面与自定义页统一消费 --pod-page-bg-color，卡片与面板消费 --pod-card-bg-color。导航隐藏不自动改为透明；渐变、纹理、图片属于页面局部装饰层。明确的应用背景设计通过 app-theme.css 配置平台 token。',
+      '模板中“固定无彩画布”“中性灰必须 R=G=B”“禁止主题色进入背景”等默认限制在本项目不适用；保留布局、圆角、阴影与组件结构。不要为了保留模板灰底，把用户选择的浅彩导航改白。',
+      '页面背景消费 --pod-page-bg-color，卡片消费 --pod-card-bg-color（回退 --color-white），边界消费 --pod-card-border；近白页面与白卡必须保留可见细边框，不能只靠阴影分层。导航、表头、嵌套区域与选中态消费同一组品牌/填充 token。',
+      '正文与标题使用 --color-text1-4，表头与 placeholder 使用 --color-text1-10，辅助说明使用 --color-text1-3；保持中性文字明度层级，不把整页文字染成主色。成功、警告、错误沿用应用语义色。',
+      'antd 的主色、容器、浮层、文字、边框、填充及语义色都须映射应用 token；浅彩氛围不能仅出现在导航和主按钮。页面实现前先读本节，再读取下面的结构与组件规则。', '',
+    ].join('\n'));
   }
-  chapters[4] = renderProjectApplications(plan, tokens, { ...color, primaryColor, source: colorSource }, chapters[4]);
-  let body = `# ${name} design.md\n\n${chapters.join('\n\n')}\n`;
-  body = body.replace(/\{\{PROJECT_NAME\}\}/g, () => name).replace(/\{\{COLOR_SOURCE\}\}/g, () => colorSource);
-  const references = componentReferences(body);
-  body = references.body;
   const scenes = {};
   for (const page of plan.pages?.customPageDetails || []) {
-    const key = page.sceneKey || (options.draft ? sceneForPage(page) : pageHandoff(page, plan).scene);
-    scenes[key] = scenes[key] || { pages: [] };
-    scenes[key].pages.push({ pageId: page.pageId, anchor: `#${pageAnchor(page.pageId)}` });
-  }
-  const metadata = {
-    schemaVersion: '1.0', name, description: parsed.metadata.description,
-    ...(theme.collection === 'application-styles' ? { applicationStyle: { recipe: 'application-style-v1', mode: theme.mode } } : {}),
-    ...(theme.mode === 'creative' ? { creativeDirection: visual.creativeDirection } : {}),
-    buildPlanRevision: text(meta.revision, 'unversioned'), tokens: parsed.metadata.tokens,
-    themeProfile: {
-      name: visualDirection.label, themeColor: primaryColor, themeColorSource: colorSource,
-      contentTone: resolveContentTone(theme, tokens), navTheme: navigationStyle.tone, themeDelivery: 'app-custom-theme-file',
-      themeFile: path.join(options.outputDir || path.join('prd', meta.projectName || name), 'app-theme.css'),
-      ...navigationConfig(plan), logoSource: 'appIcon',
-    },
-    sceneRecipes: scenes, components: references.components, states: references.states,
-    assetStrategy: { pages: [], ...forUser.assetStrategy },
-    iconSystem: forUser.iconSystem || { library: 'lucide-react', mappings: {} },
-  };
-  for (const page of options.draft ? [] : plan.pages?.customPageDetails || []) {
+    const handoff = pageHandoff(page, plan);
+    const key = page.sceneKey || handoff.scene;
+    scenes[key] = scenes[key] || { scene: handoff.scene, inherits: 'themeProfile', pages: [] };
+    scenes[key].pages.push({
+      pageId: page.pageId, density: page.density, layoutPattern: page.layoutPattern,
+      visualApplication: (forUser.pageApplications || []).find(item => item.pageId === page.pageId) || {},
+    });
+  }
+  const references = { themeProfile: {}, sceneRecipes: scenes, ...componentReferences(output) };
+  for (const page of plan.pages?.customPageDetails || []) {
     for (const ref of pageHandoff(page, plan).designRefs) {
       requireFact(/^(themeProfile|sceneRecipes\.[\p{L}\p{N}_-]+|components\.[\w-]+|states\.[\w-]+)$/u.test(ref)
-        && ref.split('.').reduce((value, key) => Object.prototype.hasOwnProperty.call(value || {}, key) ? value[key] : undefined, metadata),
+        && ref.split('.').reduce((value, key) => Object.prototype.hasOwnProperty.call(value || {}, key) ? value[key] : undefined, references),
       `页面 ${page.name} 的设计引用不存在：${ref}`);
     }
   }
-  const output = serializeDesignDocument(metadata, body);
-  const unresolved = output.match(/\{\{[^}]+\}\}|<[^>]*(?:实际色值|生成期标记)[^>]*>|"--[^"]+"\s*:\s*"AI 根据[^"]*生成[^"]*"/g);
+  output = output.replace(/^---\n/, () => [
+    '---',
+    `assetStrategy: ${JSON.stringify({ pages: [], ...forUser.assetStrategy })}`,
+    `themeProfile: ${JSON.stringify({ themeColor: primaryColor, navTheme: navigationStyle.tone, ...navigationConfig(plan), logoSource: 'appIcon', themeDelivery: 'app-custom-theme-file' })}`,
+    `sceneRecipes: ${JSON.stringify(scenes)}`,
+    `components: ${JSON.stringify(references.components)}`,
+    `states: ${JSON.stringify(references.states)}`, '',
+  ].join('\n'));
+  const unresolved = output.match(
+    /\{\{[^}]+\}\}|<[^>]*(?:实际色值|生成期标记)[^>]*>|"--[^"]+"\s*:\s*"AI 根据[^"]*生成[^"]*"/g
+  );
   if (unresolved) {
     throw new CliError('design.md 仍包含未解析占位符或 Token 推导指令', {
-      code: 'DESIGN_PLAN_UNRESOLVED_TEMPLATE', details: { unresolved: [...new Set(unresolved)] },
+      code: 'DESIGN_PLAN_UNRESOLVED_TEMPLATE',
+      details: { unresolved: [...new Set(unresolved)] },
     });
   }
   return output;
@@ -838,9 +783,8 @@ function renderHtml(plan, sections) {
 
 // Draft sections share the final PRD renderer; implementation details are filled at final validation.
 function renderDraftPrd(plan) {
-  const { navigationStyle } = visualSelections(plan);
   return renderPrd(plan, {
-    appConfig: { ...navigationConfig(plan), navTheme: navigationStyle.tone },
+    appConfig: { ...navigationConfig(plan), navTheme: plan.visualStyle?.forUser?.navigationStyle?.tone },
     pageNavigation: [], sampleDataPlan: [],
     pages: (plan.pages?.customPageDetails || []).map(page => ({ pageSpecHandoff: page.pageSpecHandoff || {} })),
     interactionStates: {}, resourceBlueprint: [], resourceCreationOrder: [], pageImplementationOrder: [],
@@ -848,7 +792,7 @@ function renderDraftPrd(plan) {
   });
 }
 
-function prepareArtifacts(sourcePlan, outputDir, themeSeed, options = {}) {
+function prepareArtifacts(sourcePlan, outputDir, themeSeed) {
   const timings = {};
   let authoringIssues = [];
   const measure = (name, action) => {
@@ -865,27 +809,12 @@ function prepareArtifacts(sourcePlan, outputDir, themeSeed, options = {}) {
     authoringIssues = validateAuthoring(normalized);
     return normalized;
   });
-  const designFile = path.resolve(outputDir, 'design.md');
-  const execution = measure('businessValidationMs', () => buildExecution(plan, { designFile }));
-  const assetStrategy = plan.visualStyle?.forUser?.assetStrategy;
-  const assetTasks = measure('assetValidationMs', () => {
-    if (assetStrategy !== undefined && (!assetStrategy || typeof assetStrategy !== 'object' || Array.isArray(assetStrategy))) {
-      throw new CliError(t('asset.invalidStrategy'), { code: 'ASSET_DESIGN_INVALID', details: { field: 'visualStyle.forUser.assetStrategy' } });
-    }
-    const tasks = buildAssetTasks({ pages: [], ...assetStrategy }, outputDir);
-    return plan.execution?.explicitScope?.allowInferredResources === false ? [] : tasks;
-  });
+  const execution = measure('businessValidationMs', () => buildExecution(plan));
   const prd = measure('prdMs', () => renderPrd(plan, execution));
-  const design = measure('designMs', () => renderDesign(plan, { outputDir }));
-  measure('designValidationMs', () => validateDesignDocument(design, { prdMarkdown: prd, designFile }));
+  const design = measure('designMs', () => renderDesign(plan));
   // Validate the same public CSS pipeline used by both Fast and Plan before writing artifacts.
-  const baseTheme = measure('themeValidationMs', () => applyDesignTokens(fs.readFileSync(path.join(PACKAGE_ROOT, 'yida-skills/skills/yida-design/references/theme/app-custom-theme-template.css'), 'utf8'), design));
-  if (options.renderHtml === false && authoringIssues.length) {
-    throw new CliError(t('design_document.invalid', 'build-plan.json', authoringIssues.map(issue => `${issue.path}: ${issue.message}`).join('; ')), {
-      code: 'DESIGN_PLAN_VALIDATION_FAILED', details: { issues: authoringIssues },
-    });
-  }
-  const html = options.renderHtml === false ? undefined : measure('htmlMs', () => renderHtml({ ...plan, execution }));
+  measure('themeValidationMs', () => applyDesignTokens(fs.readFileSync(path.join(PACKAGE_ROOT, 'yida-skills/skills/yida-design/references/theme/app-custom-theme-template.css'), 'utf8'), design));
+  const html = measure('htmlMs', () => renderHtml({ ...plan, execution }));
   const outputs = {
     prd: path.join(outputDir, 'prd.md'),
     design: path.join(outputDir, 'design.md'),
@@ -894,38 +823,14 @@ function prepareArtifacts(sourcePlan, outputDir, themeSeed, options = {}) {
   };
   const existingCss = fs.existsSync(outputs.theme) ? fs.readFileSync(outputs.theme, 'utf8') : themeSeed?.css;
   const previousDesign = fs.existsSync(outputs.theme) && fs.existsSync(outputs.design) ? fs.readFileSync(outputs.design, 'utf8') : themeSeed?.design;
-  const theme = measure('themeMs', () => existingCss !== undefined ? applyDesignTokens(existingCss, design, previousDesign) : baseTheme);
+  const theme = measure('themeMs', () => applyDesignTokens(existingCss || fs.readFileSync(path.join(PACKAGE_ROOT,
+    'yida-skills/skills/yida-design/references/theme/app-custom-theme-template.css'), 'utf8'), design, previousDesign));
   return {
-    revision: (plan.meta || {}).revision || null, outputs, timings, assetTasks,
-    themeInput: { css: existingCss, design: previousDesign },
-    files: [[outputs.prd, prd], [outputs.design, design], ...(html === undefined ? [] : [[outputs.html, html]]), [outputs.theme, theme]],
+    revision: (plan.meta || {}).revision || null, outputs, timings,
+    files: [[outputs.prd, prd], [outputs.design, design], [outputs.html, html], [outputs.theme, theme]],
   };
 }
 
-function prepareArtifactUpdate(artifacts, outputDir, previousArtifacts) {
-  const updates = prepareUpdates(artifacts, outputDir, previousArtifacts);
-  const content = file => updates.files.find(([target]) => target === file)?.[1] ?? fs.readFileSync(file, 'utf8');
-  const design = content(artifacts.outputs.design);
-  const generated = file => artifacts.files.find(([target]) => target === file)?.[1];
-  const prd = content(artifacts.outputs.prd);
-  // Generated content was already validated; local merges must be checked again.
-  if (design !== generated(artifacts.outputs.design) || prd !== generated(artifacts.outputs.prd)) {
-    validateDesignDocument(design, { prdMarkdown: prd, designFile: path.resolve(artifacts.outputs.design) });
-  }
-  // CSS consumes the merged design, including preserved local additions.
-  if (fs.existsSync(artifacts.outputs.theme)) {
-    const current = fs.readFileSync(artifacts.outputs.theme, 'utf8');
-    const previous = updates.previousDesign || (fs.existsSync(artifacts.outputs.design) ? fs.readFileSync(artifacts.outputs.design, 'utf8') : undefined);
-    const sameInput = design === generated(artifacts.outputs.design)
-      && current === artifacts.themeInput?.css && previous === artifacts.themeInput?.design;
-    const css = sameInput ? generated(artifacts.outputs.theme) : applyDesignTokens(current, design, previous);
-    updates.files = updates.files.filter(([file]) => file !== artifacts.outputs.theme);
-    updates.updated = updates.updated.filter(file => file !== artifacts.outputs.theme);
-    if (css !== current) {updates.files.push([artifacts.outputs.theme, css]); updates.updated.push(artifacts.outputs.theme);}
-  }
-  return updates;
-}
-
 function materializeUnlocked(inputPath, options = {}) {
   const start = performance.now();
   const input = path.resolve(inputPath);
@@ -934,9 +839,6 @@ function materializeUnlocked(inputPath, options = {}) {
   const readMs = performance.now() - start;
   const mergeStart = performance.now();
   const merging = options.businessFile !== undefined || options.visualFile !== undefined;
-  if (options.rebaseParts && !merging) {
-    throw new CliError('--rebase-parts requires --business-file and --visual-file', { code: 'DESIGN_PLAN_PARTS_REQUIRED' });
-  }
   if (merging && (!options.businessFile || !options.visualFile)) {
     throw new CliError('--business-file 与 --visual-file 需同时提供', { code: 'DESIGN_PLAN_PARTS_REQUIRED' });
   }
@@ -945,34 +847,30 @@ function materializeUnlocked(inputPath, options = {}) {
   }
   if (merging && options.fromPreview) { throw new CliError('选择一种规划来源', { code: 'DESIGN_PLAN_PART_CONFLICT' }); }
   const merged = options.fromPreview ? require('./preview').finalizePreview(source, path.join(path.dirname(input), 'preview/.state.json'))
-    : merging ? mergeParts(source, options.businessFile, options.visualFile, { input, rebaseParts: options.rebaseParts }) : source;
+    : merging ? mergeParts(source, options.businessFile, options.visualFile) : source;
   const updatesSource = merging || options.fromPreview;
   const mergeMs = performance.now() - mergeStart;
   const previewDir = path.join(path.dirname(input), 'preview');
   const previewState = path.join(previewDir, '.state.json');
   let themeSeed;
-  const savedPreview = fs.existsSync(previewState) ? readJson(previewState) : null;
-  if (savedPreview?.facts?.visualStyle && savedPreview.base?.digest === require('./parallel').planBase(source).digest
+  if (fs.existsSync(previewState) && readJson(previewState).facts?.visualStyle && readJson(previewState).base?.digest === require('./parallel').planBase(source).digest
     && ['design.md', 'app-theme.css'].every(name => fs.existsSync(path.join(previewDir, name)))) {
     themeSeed = { design: fs.readFileSync(path.join(previewDir, 'design.md'), 'utf8'), css: fs.readFileSync(path.join(previewDir, 'app-theme.css'), 'utf8') };
   }
   const artifacts = prepareArtifacts(merged, outputDir, themeSeed);
-  const updates = prepareArtifactUpdate(artifacts, outputDir);
-  if (updates.files.some(([file]) => path.resolve(file) === input)) {
+  if (artifacts.files.some(([file]) => path.resolve(file) === input)) {
     throw new CliError('输出文件不能覆盖 build-plan.json', { code: 'DESIGN_PLAN_OUTPUT_CONFLICT' });
   }
   const writeStart = performance.now();
-  if (merging && updates.files.some(([file]) => [options.businessFile, options.visualFile].some(part => path.resolve(part) === path.resolve(file)))) {
+  if (merging && artifacts.files.some(([file]) => [options.businessFile, options.visualFile].some(part => path.resolve(part) === path.resolve(file)))) {
     throw new CliError('输出路径与规划片段冲突', { code: 'DESIGN_PLAN_OUTPUT_CONFLICT' });
   }
   if (!options.check) {
-    writeFiles(updatesSource ? [[input, `${JSON.stringify(merged, null, 2)}\n`], ...updates.files] : updates.files);
+    writeFiles(updatesSource ? [[input, `${JSON.stringify(merged, null, 2)}\n`], ...artifacts.files] : artifacts.files);
   }
   const timings = { readMs, ...(merging ? { mergeMs } : {}), ...artifacts.timings, writeMs: performance.now() - writeStart, totalMs: performance.now() - start };
   for (const key of Object.keys(timings)) {timings[key] = Math.round(timings[key] * 100) / 100;}
-  return { success: true, checked: options.check === true, input, outputDir, revision: artifacts.revision, outputs: artifacts.outputs, updated: options.check ? [] : updates.updated, assetTasks: artifacts.assetTasks, timings,
-    ...(!options.check ? { confirmation: require('./confirmation').confirmationPayload(artifacts.outputs, artifacts.revision) } : {}),
-    ...(updatesSource ? { merged: true, previousRevision: source.meta.revision } : {}) };
+  return { success: true, checked: options.check === true, input, outputDir, revision: artifacts.revision, outputs: artifacts.outputs, timings, ...(updatesSource ? { merged: true, previousRevision: source.meta.revision } : {}) };
 }
 
 function materialize(inputPath, options = {}) {
@@ -987,12 +885,11 @@ function materialize(inputPath, options = {}) {
 
 module.exports = {
   prepareArtifacts,
-  prepareArtifactUpdate,
   renderDraftPrd,
   renderHtml,
   materialize,
   normalizePlan,
-  renderDesign: (plan, options) => renderDesign(normalizePlan(plan), options),
+  renderDesign: plan => renderDesign(normalizePlan(plan)),
   renderPrd: source => {
     const plan = normalizePlan(source);
     renderDesign(plan);