openyida 2026.9.19 → 2026.9.21

package/lib/design-plan/materialize.js

@@ -9,13 +9,13 @@ const { normalizePlan, assertThemeProfile } = require('./normalize');
 const { readJson, writeFiles } = require('./files');
 const { prepareUpdates } = require('./artifact-updates');
 const { validateAuthoring } = require('./validate');
-const { buildEntryNavigation } = require('./entry-navigation');
+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, resolveThemeColors, resolveColorToken } = require('./themes');
+const { PLAN_SKILL_ROOT, loadThemeIndex, themeTemplatePath, themeNavTheme, resolveThemeColors, resolveColorToken } = require('./themes');
 const { parseDesignDocument, serializeDesignDocument, validateDesignDocument } = require('../design/document');
 
 const PACKAGE_ROOT = path.resolve(__dirname, '..', '..');
@@ -65,11 +65,10 @@ function visualSelections(plan) {
     description: forUser.styleSummary || '保持清晰、稳定并适合持续业务操作。',
     source: forUser.styleSource || selectedTheme.source || 'legacy_default',
   };
-  const navigationStyle = forUser.navigationStyle || {
-    structure: 'side',
-    tone: 'light',
-    source: 'legacy_default',
-    selectionReason: '兼容旧版搭建计划；新计划必须显式记录导航选择。',
+  const theme = loadThemeIndex().themes.find(item => item.themeId === selectedTheme.themeId);
+  const navigationStyle = {
+    ...(forUser.navigationStyle || {}),
+    ...(theme && theme.mode !== 'creative' ? { tone: themeNavTheme(theme), toneSource: 'theme_derived' } : {}),
   };
   return { visual, forUser, selectedTheme, visualDirection, navigationStyle };
 }
@@ -78,6 +77,15 @@ 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' });}
 }
@@ -356,6 +364,7 @@ function buildExecution(plan, options = {}) {
   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 与入口管理菜单冲突，请修改入口菜单这一份源事实');
@@ -382,7 +391,7 @@ function buildExecution(plan, options = {}) {
 
 function renderEntryNavigation(recommendation) {
   if (!Array.isArray(recommendation?.entries)) {return [];}
-  const lines = ['### 访问态入口与权限', '访客端与业务管理端共享资源，分别组织菜单；页面隐藏导航不授予业务权限。', ''];
+  const lines = ['### 访问态入口与权限', ENTRY_MODE_SUMMARIES[recommendation.mode], '页面隐藏导航不授予业务权限。', ''];
   for (const entry of recommendation.entries) {
     const rows = [];
     const visit = items => {
@@ -476,35 +485,11 @@ 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 navigationPalette(primaryColor, tone, tokens) {
-  const shell = resolveColorToken(tokens, '--pod-shell-theme-bg-color');
-  const isDark = shell && [1, 3, 5].every(index => parseInt(shell.slice(index, index + 2), 16) < 128);
-  if (!shell || isDark === (tone === 'dark')) {return {};}
-  const dark = tone === 'dark';
-  const background = dark
-    ? mixHex(primaryColor, [23, 23, 23], 0.62)
-    : mixHex(primaryColor, [255, 255, 255], 0.96);
-  return {
-    '--pod-shell-theme-bg-color': background,
-    '--pod-nav-item-text-color': dark ? '#D6D6D6' : '#606060',
-    '--pod-nav-item-text-hover-color': dark ? '#FFFFFF' : '#303030',
-    '--pod-nav-item-text-selected-color': dark ? '#FFFFFF' : '#171717',
-    '--pod-nav-menu-bg-hover-color': mixHex(background, dark ? [255, 255, 255] : [0, 0, 0], dark ? 0.08 : 0.04),
-    '--pod-nav-menu-bg-selected-color': mixHex(background, dark ? [255, 255, 255] : [0, 0, 0], dark ? 0.16 : 0.08),
-  };
-}
-
 function resolveTheme(plan) {
   const { selectedTheme: selected } = visualSelections(plan);
   const index = loadThemeIndex();
   const theme = (index.themes || []).find(item => item.themeId === selected.themeId);
-  if (!theme || theme.templatePath !== selected.templatePath) {
+  if (!theme || (theme.templatePath !== selected.templatePath && (!theme.legacyTemplatePath || theme.legacyTemplatePath !== selected.templatePath))) {
     throw new CliError('selectedTheme 的 themeId 与 templatePath 不属于主题索引中的同一记录', {
       code: 'DESIGN_PLAN_THEME_MISMATCH',
       details: { selectedTheme: selected },
@@ -537,14 +522,38 @@ function renderNavigationDesign(plan, navigationStyle, tokens) {
     '--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(navigationStyle.selectionReason)}`, '',
-    mdTable(['角色', '变量', '本项目取值'], Object.entries(roles).map(([name, role]) => [role, name, tokens[name]])), '',
+    `- 布局依据：${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')),
@@ -610,7 +619,7 @@ function renderProjectApplications(plan, tokens, color, chapter) {
     '## 5. 项目应用与调整规则', '',
     themeImplementationRules(chapter), '',
     '### 本项目实现边界', '',
-    '本项目显式 Token 与页面决定优先于默认值；原生导航采用第二章列出的六项实际配色，自绘导航按本项目入口方案实施。业务内容、操作和数据来自 PRD，条件配方仅用于本项目已有内容。',
+    '本项目显式 Token 与页面决定优先于默认值；原生导航采用第二章的导航设计和完整导航 token，自绘导航按本项目入口方案实施。导航、应用框架、表单、自定义页面与详情保持统一风格。业务内容、操作和数据来自 PRD，条件配方用于本项目已有内容。',
     `已确认约束：${text(plan.visualStyle?.constraints, '无额外约束')}。`, '',
     '### 配色与语义', '',
     `本项目主色为 ${text(color.primaryColorName, '')} ${color.primaryColor}；来源为 ${text(color.source, 'AI 推断')}。${text(color.usage, '用于主要品牌操作和少量焦点，独立数据色和平台状态色保持各自语义。')}`, '',
@@ -704,10 +713,19 @@ function renderDesign(plan, options = {}) {
   const parsed = parseDesignDocument(source);
   const themeTokens = readDesignTokens(source);
   const explicitTokens = visual.tokens || {};
+  if (theme.mode === 'creative') {
+    require('../app/application-style').validateCreativeDirection(visual.creativeDirection, explicitTokens);
+  }
   if (typeof explicitTokens !== 'object' || Array.isArray(explicitTokens)) {
     throw new CliError('visualStyle.tokens 必须是 CSS token 对象', { code: 'DESIGN_PLAN_INVALID_TOKENS' });
   }
-  const overrides = { ...navigationPalette(primaryColor, navigationStyle.tone, themeTokens), ...explicitTokens };
+  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 };
   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' });
@@ -722,11 +740,25 @@ function renderDesign(plan, options = {}) {
   if (chapters.length !== 5) {
     throw new CliError('主题缺少五章设计结构，请检查模板', { code: 'DESIGN_PLAN_THEME_CONTEXT_MISSING' });
   }
-  chapters[0] = chapters[0].replace(/(^## 1\. 风格摘要\n\s*)\*\*([^\n]+)\*\*[ \t]*\n(?:[ \t]*\n)?/m,
+  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 })}`;
-  chapters[1] = chapters[1].replace(/^(### 2\.2 应用导航\n)/m,
-    (_, heading) => `${heading}\n${renderNavigationDesign(plan, navigationStyle, tokens)}\n\n`);
+  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`;
+    });
   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];
@@ -754,10 +786,12 @@ function renderDesign(plan, options = {}) {
   }
   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,
-      navTheme: navigationStyle.tone, themeDelivery: 'app-custom-theme-file',
+      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',
     },
@@ -804,8 +838,9 @@ 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: plan.visualStyle?.forUser?.navigationStyle?.tone },
+    appConfig: { ...navigationConfig(plan), navTheme: navigationStyle.tone },
     pageNavigation: [], sampleDataPlan: [],
     pages: (plan.pages?.customPageDetails || []).map(page => ({ pageSpecHandoff: page.pageSpecHandoff || {} })),
     interactionStates: {}, resourceBlueprint: [], resourceCreationOrder: [], pageImplementationOrder: [],
@@ -899,6 +934,9 @@ 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' });
   }
@@ -907,7 +945,7 @@ 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) : source;
+    : merging ? mergeParts(source, options.businessFile, options.visualFile, { input, rebaseParts: options.rebaseParts }) : source;
   const updatesSource = merging || options.fromPreview;
   const mergeMs = performance.now() - mergeStart;
   const previewDir = path.join(path.dirname(input), 'preview');
@@ -932,7 +970,9 @@ function materializeUnlocked(inputPath, options = {}) {
   }
   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, ...(updatesSource ? { merged: true, previousRevision: source.meta.revision } : {}) };
+  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 } : {}) };
 }
 
 function materialize(inputPath, options = {}) {

package/lib/design-plan/normalize.js

@@ -5,7 +5,7 @@ const { CliError } = require('../core/cli-error');
 const { t } = require('../core/i18n');
 const { readJson } = require('./files');
 
-const { PLAN_SKILL_ROOT, loadThemeIndex } = require('./themes');
+const { PLAN_SKILL_ROOT, loadThemeIndex, themeNavTheme } = require('./themes');
 const PAGE_PATTERN_INDEX_PATH = path.join(PLAN_SKILL_ROOT, 'templates', 'page-patterns', 'index.json');
 
 function clone(value) {
@@ -27,7 +27,7 @@ function assertVisualFieldObjects(forUser, options = {}) {
   const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
   const examples = {
     visualDirection: { label: '<label>', description: '<description>' },
-    navigationStyle: { structure: 'top', tone: 'light' },
+    navigationStyle: { structure: 'top' },
   };
   const issues = [];
   const check = (value, field, example) => {
@@ -270,7 +270,7 @@ function selectedTheme(plan, themeIndex) {
       details: { themeId: selected.themeId },
     });
   }
-  if (selected.templatePath && selected.templatePath !== theme.templatePath) {
+  if (selected.templatePath && selected.templatePath !== theme.templatePath && selected.templatePath !== theme.legacyTemplatePath) {
     throw new CliError('selectedTheme 的 themeId 与 templatePath 不属于主题索引中的同一记录', {
       code: 'DESIGN_PLAN_THEME_MISMATCH',
       details: { selectedTheme: selected },
@@ -281,7 +281,7 @@ function selectedTheme(plan, themeIndex) {
   selected.summary = selected.summary || [theme.styleSummary, selected.customText].filter(Boolean).join('；');
   assertThemeProfile(forUser.themeProfile, theme);
   forUser.themeProfile = { ...(theme.defaultProfile || {}) };
-  return theme;
+  return { ...theme, navTheme: themeNavTheme(theme) };
 }
 
 function pageApplicationDefaults(page) {
@@ -302,13 +302,18 @@ function pageApplicationDefaults(page) {
   };
 }
 
-function ensureVisual(plan) {
+function ensureVisual(plan, theme) {
   const visual = plan.visualStyle;
   const forUser = visual.forUser;
   const selected = visual.internal.selectedTheme;
   const direction = forUser.visualDirection || {};
   const color = forUser.colorStrategy = forUser.colorStrategy || {};
-  const navigation = forUser.navigationStyle || {};
+  const navigation = forUser.navigationStyle = forUser.navigationStyle || {};
+  if (theme.mode !== 'creative') {navigation.tone = theme.navTheme;}
+  navigation.toneSource = theme.mode === 'creative' ? 'project_defined' : 'theme_derived';
+  if (!['light', 'dark'].includes(navigation.tone)) {
+    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', { code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE' });
+  }
   if (!direction.label || !direction.description) {
     throw new CliError('schemaVersion 2.0 必须提供 visualStyle.forUser.visualDirection.label 和 description', {
       code: 'DESIGN_PLAN_VISUAL_DIRECTION_REQUIRED',
@@ -320,12 +325,6 @@ function ensureVisual(plan) {
       details: { structure: navigation.structure },
     });
   }
-  if (!['light', 'dark'].includes(navigation.tone)) {
-    throw new CliError('visualStyle.forUser.navigationStyle.tone 必须是 light 或 dark', {
-      code: 'DESIGN_PLAN_INVALID_NAVIGATION_TONE',
-      details: { tone: navigation.tone },
-    });
-  }
   const sourceApplications = new Map(list(forUser.pageApplications).map(item => [item.pageId || item.pageName, item]));
   forUser.pageApplications = list((plan.pages || {}).customPageDetails).map(page => {
     const source = sourceApplications.get(page.pageId) || sourceApplications.get(page.name) || {};
@@ -404,8 +403,8 @@ function normalizePlan(sourcePlan) {
   const pagePatternIndex = readJson(PAGE_PATTERN_INDEX_PATH, '页面模式索引');
   ensureOverview(plan);
   ensurePageRules(plan, pagePatternIndex);
-  selectedTheme(plan, themeIndex);
-  ensureVisual(plan);
+  const theme = selectedTheme(plan, themeIndex);
+  ensureVisual(plan, theme);
   return plan;
 }
 

package/lib/design-plan/parallel.js

@@ -2,6 +2,7 @@
 
 const { createHash } = require('crypto');
 const { CliError } = require('../core/cli-error');
+const { t } = require('../core/i18n');
 const { readJson } = require('./files');
 const { assertVisualFieldObjects } = require('./normalize');
 
@@ -11,13 +12,14 @@ function planBase(plan) {
   return { revision: plan.meta?.revision, digest: createHash('sha256').update(JSON.stringify(plan)).digest('hex') };
 }
 
-function readPart(file, role, base, allowed) {
-  const part = readJson(file, `${role} 规划片段`);
+function readPart(file, role, base, allowed, supplied) {
+  const part = supplied || readJson(file, `${role} 规划片段`);
   if (!object(part) || part.ready !== true || !object(part.facts)) {
     throw new CliError(`${role} 规划尚未完成，请补齐 facts 并设置 ready=true`, { code: 'DESIGN_PLAN_PART_NOT_READY' });
   }
   if (part.base?.revision !== base.revision || part.base?.digest !== base.digest) {
-    throw new CliError(`${role} 规划来自旧版本，请根据当前计划重新整理`, { code: 'DESIGN_PLAN_STALE_PART' });
+    throw new CliError(`${role} 规划来自旧版本，请根据当前计划重新整理`, { code: 'DESIGN_PLAN_STALE_PART',
+      details: { sourcePath: file, expectedBase: base, actualBase: part.base, nextStep: t('design_plan.rebase_required') } });
   }
   const unknown = Object.keys(part.facts).filter(key => !allowed.includes(key));
   if (unknown.length) {
@@ -26,10 +28,63 @@ function readPart(file, role, base, allowed) {
   return part.facts;
 }
 
-function mergeParts(source, businessFile, visualFile) {
+// Report all binding defects at once so agents can repair the existing part.
+function assertPageBindings(pages, applications, visualFile, businessFile) {
+  const prefix = 'facts.visualStyle.forUser.pageApplications';
+  const issues = [];
+  const pageIds = [];
+  pages.forEach((page, index) => {
+    const field = `facts.pages.customPageDetails[${index}].pageId`;
+    if (!object(page) || typeof page.pageId !== 'string' || !page.pageId.trim()) {
+      issues.push({ sourcePath: businessFile, path: field, code: 'expected_nonempty_string' });
+    } else if (pageIds.includes(page.pageId)) {
+      issues.push({ sourcePath: businessFile, path: field, code: 'duplicate_page', pageId: page.pageId });
+    } else { pageIds.push(page.pageId); }
+  });
+  const seen = new Set();
+  if (!Array.isArray(applications)) {
+    issues.push({ sourcePath: visualFile, path: prefix, code: 'expected_array' });
+  } else {
+    applications.forEach((item, index) => {
+      const field = `${prefix}[${index}]`;
+      if (!object(item)) {
+        issues.push({ sourcePath: visualFile, path: field, code: 'expected_object' });
+        return;
+      }
+      if (typeof item.pageId !== 'string' || !item.pageId.trim()) {
+        issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'expected_nonempty_string' });
+      } else {
+        if (!pageIds.includes(item.pageId)) {
+          issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'unexpected_page', pageId: item.pageId });
+        }
+        if (seen.has(item.pageId)) {
+          issues.push({ sourcePath: visualFile, path: `${field}.pageId`, code: 'duplicate_page', pageId: item.pageId });
+        }
+        seen.add(item.pageId);
+      }
+      if (!Array.isArray(item.visualMemoryApplications)) {
+        issues.push({ sourcePath: visualFile, path: `${field}.visualMemoryApplications`, code: 'expected_array' });
+      }
+    });
+  }
+  pageIds.filter(pageId => !seen.has(pageId)).forEach(pageId => {
+    issues.push({ sourcePath: visualFile, path: prefix, code: 'missing_page', pageId });
+  });
+  if (issues.length) {
+    const nextStep = t('design_plan.repair_page_bindings');
+    const summary = issues.map(issue => `${issue.path}: ${issue.code}${issue.pageId ? ` (${issue.pageId})` : ''}`).join('; ');
+    throw new CliError(`${nextStep} ${summary}`, {
+      code: 'DESIGN_PLAN_PAGE_BINDINGS_REQUIRED',
+      details: { sourcePath: visualFile, expectedPageIds: pageIds, issues, nextStep },
+    });
+  }
+}
+
+function mergeParts(source, businessFile, visualFile, options = {}) {
   const base = planBase(source);
-  const business = readPart(businessFile, 'business', base, ['overview', 'dataModels', 'businessFlows', 'pages', 'execution', 'meta']);
-  const visual = readPart(visualFile, 'visual', base, ['visualStyle']);
+  const rebased = options.rebaseParts ? require('./rebase').rebaseParts(source, options.input, businessFile, visualFile) : [];
+  const business = readPart(businessFile, 'business', base, ['overview', 'dataModels', 'businessFlows', 'pages', 'execution', 'meta'], rebased[0]);
+  const visual = readPart(visualFile, 'visual', base, ['visualStyle'], rebased[1]);
   assertVisualFieldObjects(visual.visualStyle?.forUser, { prefix: 'facts.visualStyle.forUser', sourcePath: visualFile });
   if (!object(business.overview) || !Array.isArray(business.dataModels) || !Array.isArray(business.businessFlows)
     || !Array.isArray(business.pages?.customPageDetails) || !object(visual.visualStyle)) {
@@ -39,13 +94,7 @@ function mergeParts(source, businessFile, visualFile) {
     || Object.keys(business.meta).some(key => !['businessDomain', 'experienceTopology'].includes(key)))) {
     throw new CliError('业务 meta 仅填写 businessDomain/experienceTopology，版本由 CLI 维护', { code: 'DESIGN_PLAN_PART_CONFLICT' });
   }
-  const pageIds = business.pages.customPageDetails.map(page => page.pageId);
-  const applications = visual.visualStyle.forUser?.pageApplications;
-  if (!Array.isArray(applications) || applications.length !== pageIds.length
-    || new Set(applications.map(item => item.pageId)).size !== pageIds.length
-    || applications.some(item => !pageIds.includes(item.pageId) || !Array.isArray(item.visualMemoryApplications))) {
-    throw new CliError('视觉规划需按业务页面逐一完成 pageApplications，再合并产物', { code: 'DESIGN_PLAN_PAGE_BINDINGS_REQUIRED' });
-  }
+  assertPageBindings(business.pages.customPageDetails, visual.visualStyle.forUser?.pageApplications, visualFile, businessFile);
   const plan = JSON.parse(JSON.stringify({ ...source, ...business, ...visual, meta: { ...source.meta, ...business.meta },
     ...(source.execution || business.execution ? { execution: { ...source.execution, ...business.execution,
       ...(source.execution?.appConfig || business.execution?.appConfig

package/lib/design-plan/patch.js

@@ -12,10 +12,13 @@ const PROTECTED_PATHS = [
   'meta.updatedAt',
   'meta.planState',
   'visualStyle.forUser.themeProfile',
+  'visualStyle.forUser.navigationStyle.tone',
+  'visualStyle.forUser.navigationStyle.toneSource',
+  'execution.appConfig.navTheme',
 ];
 const DANGEROUS_SEGMENTS = new Set(['__proto__', 'prototype', 'constructor']);
 
-function parsePath(pathExpression) {
+function parsePath(pathExpression, options = {}) {
   const expression = String(pathExpression || '').trim();
   if (!expression || !/^[A-Za-z_$][\w$-]*(?:(?:\.(?:[A-Za-z_$][\w$-]*|--[\w-]+))|(?:\[\d+\]))*$/.test(expression)) {
     throw new CliError(`无效字段路径：${expression || '(empty)'}`, {
@@ -28,11 +31,16 @@ function parsePath(pathExpression) {
       code: 'DESIGN_PLAN_UNSAFE_PATH',
     });
   }
-  if (PROTECTED_PATHS.some(protectedPath => expression === protectedPath
+  const protectedPaths = options.creative ? PROTECTED_PATHS.filter(field => field !== 'visualStyle.forUser.navigationStyle.tone') : PROTECTED_PATHS;
+  if (protectedPaths.some(protectedPath => expression === protectedPath
     || expression.startsWith(`${protectedPath}.`)
     || expression.startsWith(`${protectedPath}[`)
     || protectedPath.startsWith(`${expression}.`))) {
-    const hint = expression.includes('themeProfile') ? '；themeProfile 只读，请改 visualStyle.tokens 或 colorStrategy.primaryColor' : '';
+    const hint = expression.includes('themeProfile')
+      ? '；themeProfile 只读，请改 visualStyle.tokens 或 colorStrategy.primaryColor'
+      : /(?:navigationStyle\.(?:tone|toneSource)|appConfig\.navTheme)/.test(expression)
+        ? '；导航明暗由所选主题模板派生，请改选主题'
+        : '';
     throw new CliError(`字段 ${expression} 由 design-plan patch 自动维护，不能通过 --set 修改${hint}`, {
       code: 'DESIGN_PLAN_PROTECTED_PATH',
     });
@@ -49,7 +57,7 @@ function parseValue(rawValue) {
   }
 }
 
-function parseSetExpression(expression) {
+function parseSetExpression(expression, options = {}) {
   const separator = String(expression || '').indexOf('=');
   if (separator <= 0) {
     throw new CliError(`--set 必须使用 path=value 格式：${expression || '(empty)'}`, {
@@ -59,7 +67,7 @@ function parseSetExpression(expression) {
   const pathExpression = expression.slice(0, separator).trim();
   return {
     path: pathExpression,
-    segments: parsePath(pathExpression),
+    segments: parsePath(pathExpression, options),
     value: parseValue(expression.slice(separator + 1)),
   };
 }
@@ -67,7 +75,7 @@ function parseSetExpression(expression) {
 const OPTIONAL_PATHS = [
   /^execution$/,
   /^execution\.(resourceBlueprint|resourceCreationOrder|pageImplementationOrder|navigationOrder|navigationFallback|entryRecommendation|sampleDataPlan|interactionStates|acceptanceCriteria|explicitScope|appConfig)$/,
-  /^execution\.appConfig\.(appType|corpId|baseUrl|navigationType|hideAppNav|layoutDirection|navTheme|logoSource)$/,
+  /^execution\.appConfig\.(appType|corpId|baseUrl|navigationType|hideAppNav|layoutDirection|logoSource)$/,
   /^execution\.interactionStates\.(empty|loading|error|formEntry|detail)$/,
   /^visualStyle\.tokens(?:\.--[\w-]+)?$/,
   /^visualStyle\.forUser\.iconSystem(?:\.(library|mappings|colorPairs))?$/,
@@ -154,12 +162,17 @@ function patchPlan(inputPath, setExpressions, options = {}) {
   }
   const original = readJson(resolvedInput);
   const patched = JSON.parse(JSON.stringify(original));
-  const changes = expressions.map(parseSetExpression).map(change => ({
+  const selectedTheme = original.visualStyle?.internal?.selectedTheme || original.visualStyle?.forUser?.selectedTheme;
+  const creative = selectedTheme?.themeId === 'free-creative';
+  const changes = expressions.map(expression => parseSetExpression(expression, { creative })).map(change => ({
     ...change,
     previousValue: setExistingPath(patched, change),
   }));
   const effectiveChanges = changes.filter(change => JSON.stringify(change.previousValue) !== JSON.stringify(change.value));
   if (JSON.stringify(original) === JSON.stringify(patched)) {
+    if (options.materialize) {
+      return { ...require('./materialize').materialize(resolvedInput, { outputDir: options.outputDir }), changed: false, materialized: true, changedPaths: [], confirmationInvalidated: false };
+    }
     return {
       success: true,
       changed: false,
@@ -195,6 +208,7 @@ function patchPlan(inputPath, setExpressions, options = {}) {
     confirmationInvalidated: !assetProgressOnly,
     materialized: options.materialize === true,
     outputs: options.materialize ? artifacts.outputs : undefined,
+    ...(options.materialize ? { confirmation: require('./confirmation').confirmationPayload(artifacts.outputs, artifacts.revision) } : {}),
     updated: updates?.updated || [],
   };
 }

package/lib/design-plan/rebase.js

@@ -0,0 +1,60 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const { CliError } = require('../core/cli-error');
+const { readJson } = require('./files');
+const { t } = require('../core/i18n');
+
+const BASE_FILE = '.build-plan-base.json';
+const equal = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+const object = value => value && typeof value === 'object' && !Array.isArray(value);
+
+// Arrays represent ordered business facts; conflicting edits require a decision.
+function reconcile(base, current, proposed, field, conflicts) {
+  if (equal(current, proposed) || equal(proposed, base)) { return current; }
+  if (equal(current, base)) { return proposed; }
+  if (object(base) && object(current) && object(proposed)) {
+    const result = {};
+    for (const key of new Set([...Object.keys(base), ...Object.keys(current), ...Object.keys(proposed)])) {
+      const value = reconcile(base[key], current[key], proposed[key], field ? `${field}.${key}` : key, conflicts);
+      if (value !== undefined) { result[key] = value; }
+    }
+    return result;
+  }
+  conflicts.push(field);
+  return proposed;
+}
+
+function rebaseParts(source, input, businessFile, visualFile) {
+  const { planBase } = require('./parallel');
+  const baselinePath = path.join(path.dirname(path.resolve(input)), BASE_FILE);
+  const fail = (code, details) => { throw new CliError(t('design_plan.rebase_required'), { code, details: { baselinePath, ...details } }); };
+  if (!fs.existsSync(baselinePath)) { fail('DESIGN_PLAN_BASELINE_MISSING', { nextStep: t('design_plan.baseline_missing') }); }
+  const saved = readJson(baselinePath);
+  if (saved.schemaVersion !== 1 || !object(saved.plan) || !equal(saved.base, planBase(saved.plan))) {
+    fail('DESIGN_PLAN_BASELINE_INVALID', { nextStep: t('design_plan.baseline_missing') });
+  }
+  if (source.meta?.status !== 'draft' || source.meta?.planState?.presentedRevision
+      || source.meta?.planState?.planConfirmed || !equal(source.meta, saved.plan.meta)) {
+    fail('DESIGN_PLAN_REBASE_STAGE_INVALID', { nextStep: t('design_plan.rebase_stage_invalid') });
+  }
+  const parts = [businessFile, visualFile].map(file => readJson(file));
+  for (const [index, part] of parts.entries()) {
+    if (!equal(part.base, saved.base) || !object(part.facts)) {
+      fail('DESIGN_PLAN_BASELINE_MISMATCH', { sourcePath: [businessFile, visualFile][index], nextStep: t('design_plan.baseline_missing') });
+    }
+  }
+  return parts.map((part, index) => {
+    const conflicts = [];
+    const facts = Object.fromEntries(Object.keys(part.facts).map(key => [key,
+      reconcile(saved.plan[key], source[key], part.facts[key], key, conflicts),
+    ]));
+    if (conflicts.length) {
+      fail('DESIGN_PLAN_REBASE_CONFLICT', { sourcePath: [businessFile, visualFile][index], conflicts, nextStep: t('design_plan.rebase_conflict') });
+    }
+    return { ...part, facts, base: planBase(source) };
+  });
+}
+
+module.exports = { BASE_FILE, rebaseParts };

package/lib/design-plan/themes.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const { CliError } = require('../core/cli-error');
 const { readJson } = require('./files');
+const { parseDesignDocument } = require('../design/document');
 
 const DESIGN_SKILL_ROOT = path.resolve(__dirname, '../../yida-skills/skills/yida-design');
 const PLAN_SKILL_ROOT = path.join(DESIGN_SKILL_ROOT, 'sub_skill/yida-design-plan');
@@ -21,6 +22,20 @@ function themeTemplatePath(theme) {
   return file;
 }
 
+function themeNavTheme(theme) {
+  if (theme.mode === 'creative') {return undefined;}
+  const file = themeTemplatePath(theme);
+  const metadata = parseDesignDocument(fs.readFileSync(file, 'utf8')).metadata;
+  const navTheme = metadata.themeProfile?.navTheme || metadata.navTheme;
+  if (!['light', 'dark'].includes(navTheme)) {
+    throw new CliError(`主题模板 navTheme 无效：${theme.themeId}`, {
+      code: 'DESIGN_PLAN_THEME_NAV_THEME_INVALID',
+      details: { themeId: theme.themeId, navTheme: metadata.navTheme, templatePath: theme.templatePath },
+    });
+  }
+  return navTheme;
+}
+
 // Color recipes live with the visual theme. Resolve their token dependencies rather
 // than duplicating per-theme palettes in JavaScript.
 function resolveThemeColors(source) {
@@ -83,4 +98,4 @@ function resolveColorToken(tokens, name, seen = new Set()) {
   return alias ? resolveColorToken(tokens, alias[1], seen) || alias[2] || null : null;
 }
 
-module.exports = { DESIGN_SKILL_ROOT, PLAN_SKILL_ROOT, loadThemeIndex, themeTemplatePath, resolveThemeColors, resolveColorToken };
+module.exports = { DESIGN_SKILL_ROOT, PLAN_SKILL_ROOT, loadThemeIndex, themeTemplatePath, themeNavTheme, resolveThemeColors, resolveColorToken };