openyida 2026.9.20 → 2026.9.21

package/lib/core/sample.js

@@ -112,7 +112,7 @@ const SAMPLE_HINTS = {
   'openyida-page-template/canvas-nav-top': '顶部默认贴顶通栏；长页先合并 canvas-nav-content，CanvasNav 传 headerOnly，有首屏背景时传 overlay；悬浮外观仅显式 floating=true。',
   'openyida-page-template/canvas-nav-content': '合并 CanvasNavigationContent；长页用 layout=document，CanvasNav 传 headerOnly/overlay；默认 sticky，受宿主限制时用 navigationPosition=fixed。工作区用 workspace，宿主已分配高度时传 height。',
   'openyida-page-template/canvas-nav-data': '页内展示用 mode=local（key/viewKey/targetType=local），不请求平台菜单；platform 需真实资源 ID；independent 或声明 access 时必须接入真实 resolveAccess。保留 PRD 顺序与分组。',
-  'openyida-page-template/form-open-container': '将 import、CanvasDrawer、FormOpenContainer、useYidaFormOpen 和辅助函数合并到现有 Canvas 页面；表单按钮调用 openForm(request)，页面必须渲染返回的 formOpenContainer；保留 iframe、标题栏操作、调宽和关闭刷新。普通业务内容使用 CanvasDrawer；抽屉背景为 --pod-shell-theme-bg-color。',
+  'openyida-page-template/form-open-container': '将 import、CanvasDrawer、FormOpenContainer、useYidaFormOpen 和辅助函数合并到现有 Canvas 页面；表单按钮调用 openForm(request)，页面必须渲染返回的 formOpenContainer；保留 iframe、标题栏操作、调宽和关闭刷新。普通业务内容使用 CanvasDrawer；抽屉背景使用 --pod-page-bg-color，文字使用 --color-text1-4，background 可按设计覆盖。',
   'yida-design/app-theme': '已复制应用主题模板；请由 yida-design 按 design.md 定点修改需要变化的 token。',
 };
 
@@ -150,6 +150,8 @@ function printSampleList() {
   console.log('');
   console.log('  应用主题：openyida sample yida-design app-theme --output <app-theme.css> --design-file <design.md>');
   console.log('  Application style: openyida sample yida-design application-style --style-id <themeId|free-creative> --output <directory>');
+  console.log(`  ${t('sample_options.theme_help')}`);
+  console.log(`  ${t('sample_options.style_help')}`);
 }
 
 /**
@@ -164,10 +166,10 @@ function ensureDirectoryExists(filePath) {
 }
 
 /**
- * 解析 --output 与 --var KEY=VALUE 参数。
+ * 解析 sample 输出路径、设计文件、主题 ID 与模板变量；拒绝未声明参数。
  * @param {string[]} rest
  * @param {string} defaultOutputPath
- * @returns {{ outputPath: string, variables: Object }}
+ * @returns {{ outputPath: string, variables: Object, designFile?: string, styleId?: string }}
  */
 function parseOptions(rest, defaultOutputPath) {
   let outputPath = defaultOutputPath;
@@ -177,17 +179,16 @@ function parseOptions(rest, defaultOutputPath) {
 
   for (let i = 0; i < rest.length; i++) {
     const arg = rest[i];
+    const invalid = () => {throw new CliError(t('cli_argument.invalid', arg), { code: 'SAMPLE_ARGUMENT_INVALID' });};
+    if (!['--output', '--var', '--design-file', '--style-id'].includes(arg)) {invalid();}
+    if (!rest[i + 1] || rest[i + 1].startsWith('--')) {invalid();}
 
     if (arg === '--style-id') {
       styleId = rest[++i];
-      if (!styleId || styleId.startsWith('--')) {throw new CliError(t('design_document.invalid', '--style-id', 'APPLICATION_STYLE_REQUIRED'), { code: 'APPLICATION_STYLE_REQUIRED' });}
       continue;
     }
 
     if (arg === '--design-file') {
-      if (!rest[i + 1] || rest[i + 1].startsWith('--')) {
-        throw new CliError('--design-file 缺少 design.md 路径', { code: 'DESIGN_THEME_FILE_REQUIRED' });
-      }
       designFile = rest[++i];
       continue;
     }
@@ -201,13 +202,9 @@ function parseOptions(rest, defaultOutputPath) {
     if (arg === '--var' && rest[i + 1]) {
       const pair = rest[i + 1];
       const eqIndex = pair.indexOf('=');
-      if (eqIndex > 0) {
-        const key = pair.slice(0, eqIndex).trim();
-        const value = pair.slice(eqIndex + 1);
-        if (key) {
-          variables[key] = value;
-        }
-      }
+      if (eqIndex <= 0 || !pair.slice(0, eqIndex).trim()) {invalid();}
+      const key = pair.slice(0, eqIndex).trim();
+      variables[key] = pair.slice(eqIndex + 1);
       i++;
       continue;
     }
@@ -248,6 +245,9 @@ async function run(args) {
     if (options.designFile || Object.keys(options.variables).length) {
       throw new CliError(t('design_document.invalid', 'application-style', 'APPLICATION_STYLE_SAMPLE_INVALID'), { code: 'APPLICATION_STYLE_SAMPLE_INVALID' });
     }
+    if (!options.styleId) {
+      throw new CliError(t('cli_argument.invalid', '--style-id'), { code: 'APPLICATION_STYLE_REQUIRED' });
+    }
     const result = require('../app/application-style').exportApplicationStyle(options.styleId, options.outputPath);
     console.log(JSON.stringify(result, null, 2));
     return result;
@@ -294,6 +294,9 @@ async function run(args) {
     throw new CliError('--design-file 仅用于 yida-design app-theme', { code: 'DESIGN_THEME_SAMPLE_INVALID' });
   }
   if (sampleKey === 'yida-design/app-theme') {
+    if (Object.keys(variables).length) {
+      throw new CliError(t('cli_argument.invalid', '--var (yida-design app-theme: --design-file)'), { code: 'SAMPLE_ARGUMENT_INVALID' });
+    }
     const snapshotPath = `${outputPath}.tokens.md`;
     if (designFile && path.resolve(snapshotPath) === path.resolve(designFile)) {
       throw new CliError('输出路径不能覆盖模板或 design.md', { code: 'SAMPLE_OUTPUT_CONFLICT' });

package/lib/design-plan/confirmation.js

@@ -0,0 +1,13 @@
+'use strict';
+
+function confirmationPayload(outputs, revision) {
+  return {
+    question: '请确认当前搭建方案',
+    options: [{ label: '确认并开始搭建', value: 'confirm_build' }, { label: '继续调整', value: 'continue_editing' }],
+    submitLabel: '提交选择',
+    attachments: [{ name: '搭建方案.html', path: outputs.html }],
+    revision,
+  };
+}
+
+module.exports = { confirmationPayload };

package/lib/design-plan/design-plan.js

@@ -12,7 +12,7 @@ function usage() {
     '  openyida design-plan catalog [--json]',
     '  openyida design-plan init <requirement-brief.json> [--theme-id <id>] [--output-dir <dir>] [--json]',
     '  openyida design-plan preview <build-plan.json> --part-file <module.json> [--json]',
-    '  openyida design-plan materialize <build-plan.json> [--from-preview | --business-file <json> --visual-file <json>] [--output-dir <dir>] [--check] [--json]',
+    '  openyida design-plan materialize <build-plan.json> [--from-preview | --business-file <json> --visual-file <json>] [--output-dir <dir>] [--rebase-parts] [--check] [--json]',
     '  openyida design-plan patch <build-plan.json> --set <path=value> [--set <path=value> ...] [--materialize] [--output-dir <dir>] [--json]',
   ].join('\n');
 }
@@ -50,6 +50,46 @@ function setValues(args) {
   return values;
 }
 
+const OPTION_SCHEMA = Object.freeze({
+  catalog: { flags: ['--json'], values: [] },
+  init: { flags: ['--json'], values: ['--theme-id', '--output-dir'] },
+  preview: { flags: ['--json'], values: ['--part-file'] },
+  materialize: { flags: ['--from-preview', '--rebase-parts', '--check', '--json'], values: ['--business-file', '--visual-file', '--output-dir'] },
+  patch: { flags: ['--materialize', '--json'], values: ['--set', '--output-dir'], inlineValues: ['--set'] },
+});
+
+function assertKnownOptions(subcommand, args) {
+  const schema = OPTION_SCHEMA[subcommand];
+  const flags = new Set(schema.flags);
+  const values = new Set(schema.values);
+  const inlineValues = new Set(schema.inlineValues || []);
+  for (let index = 0; index < args.length; index += 1) {
+    const token = args[index];
+    const equalsAt = token.indexOf('=');
+    const option = equalsAt === -1 ? token : token.slice(0, equalsAt);
+    if (equalsAt !== -1 && inlineValues.has(option)) {
+      continue;
+    }
+    if (flags.has(token)) {
+      continue;
+    }
+    if (values.has(token)) {
+      if (!args[index + 1] || args[index + 1].startsWith('--')) {
+        throw new CliError(`${token} 缺少参数值`, {
+          code: 'DESIGN_PLAN_INVALID_ARGUMENT',
+          usage: usage(),
+        });
+      }
+      index += 1;
+      continue;
+    }
+    throw new CliError(`未知 ${subcommand} 参数：${token}`, {
+      code: 'DESIGN_PLAN_INVALID_ARGUMENT',
+      usage: usage(),
+    });
+  }
+}
+
 async function run(args) {
   const subcommand = args[0];
   if (!subcommand || args.includes('--help') || args.includes('-h')) {
@@ -63,6 +103,7 @@ async function run(args) {
     });
   }
   if (subcommand === 'catalog') {
+    assertKnownOptions(subcommand, args.slice(1));
     console.log(JSON.stringify(catalog(), null, 2));
     return;
   }
@@ -74,13 +115,14 @@ async function run(args) {
     });
   }
   const options = args.slice(2);
+  assertKnownOptions(subcommand, options);
   const outputDir = optionValue(options, '--output-dir');
   const result = subcommand === 'init'
     ? initialize(input, { outputDir, themeId: optionValue(options, '--theme-id') })
     : subcommand === 'preview'
       ? preview(input, { partFile: optionValue(options, '--part-file') })
       : subcommand === 'materialize'
-        ? materialize(input, { outputDir, check: options.includes('--check'), fromPreview: options.includes('--from-preview'), businessFile: optionValue(options, '--business-file'), visualFile: optionValue(options, '--visual-file') })
+        ? materialize(input, { outputDir, check: options.includes('--check'), rebaseParts: options.includes('--rebase-parts'), fromPreview: options.includes('--from-preview'), businessFile: optionValue(options, '--business-file'), visualFile: optionValue(options, '--visual-file') })
         : patchPlan(input, setValues(options), { outputDir, materialize: options.includes('--materialize') });
 
   if (options.includes('--json') || subcommand === 'preview') {

package/lib/design-plan/entry-navigation.js

@@ -2,6 +2,13 @@
 
 const { CliError } = require('../core/cli-error');
 const { t } = require('../core/i18n');
+const ENTRY_MODES = Object.freeze(['unified', 'service-management', 'frontend-only', 'backend-only']);
+const ENTRY_MODE_SUMMARIES = Object.freeze({
+  unified: '不分前后台：使用同一套业务页面，按职责显示菜单、数据和操作。',
+  'service-management': '分前后台：办事的人使用前台，处理业务的人使用后台，两边共享业务数据。',
+  'frontend-only': '只有访问前台：本次提供办理、查询或展示页面；需要处理的业务由已有系统、人员入口或自动流程承接。',
+  'backend-only': '只有访问后台：工作人员录入、受理、处理或维护业务，办事入口在别处或本次不需要。',
+});
 const filled = value => typeof value === 'string' && value.trim().length > 0;
 const object = value => value && typeof value === 'object' && !Array.isArray(value);
 const assert = (condition, message, details) => {
@@ -12,7 +19,7 @@ const assert = (condition, message, details) => {
 function buildEntryNavigation(plan, resources, pages) {
   const recommendation = plan.execution?.entryRecommendation;
   if (recommendation === undefined) {return null;}
-  assert(object(recommendation) && ['unified', 'service-management', 'frontend-only'].includes(recommendation.mode), '入口方案需要明确 unified/service-management/frontend-only');
+  assert(object(recommendation) && ENTRY_MODES.includes(recommendation.mode), t('cli.design_plan_entry_mode_required'));
   assert(Array.isArray(recommendation.entries) && recommendation.entries.length > 0, '入口方案缺少 entries');
   const names = new Set(resources.map(resource => resource.name));
   const entryKeys = new Set();
@@ -83,7 +90,8 @@ function buildEntryNavigation(plan, resources, pages) {
   const roles = recommendation.entries.map(entry => entry.role);
   assert(recommendation.mode !== 'service-management' || (roles.includes('service') && roles.includes('management')), '前后台方案必须同时包含访客端和业务管理端');
   assert(recommendation.mode !== 'frontend-only' || roles.every(role => role === 'service'), '仅前台方案不能包含管理入口');
+  assert(recommendation.mode !== 'backend-only' || roles.every(role => role === 'management'), t('cli.design_plan_backend_only_roles'));
   return { recommendation: JSON.parse(JSON.stringify(recommendation)), platformOrder: [...new Set(platformOrder)] };
 }
 
-module.exports = { buildEntryNavigation };
+module.exports = { buildEntryNavigation, ENTRY_MODES, ENTRY_MODE_SUMMARIES };

package/lib/design-plan/init.js

@@ -9,7 +9,7 @@ const { planBase } = require('./parallel');
 const { collectIssues } = require('./validate');
 const { assertVisualFieldObjects } = require('./normalize');
 
-const { PLAN_SKILL_ROOT: ROOT, loadThemeIndex, themeTemplatePath } = require('./themes');
+const { PLAN_SKILL_ROOT: ROOT, loadThemeIndex, themeTemplatePath, themeNavTheme } = require('./themes');
 
 function list(value) {
   return Array.isArray(value) ? value : [];
@@ -139,13 +139,14 @@ function initialize(inputPath, options = {}) {
       code: 'DESIGN_PLAN_THEME_UNKNOWN', details: { themes: themes.map(({ themeId, label }) => ({ themeId, label })), catalogCommand: 'openyida design-plan catalog --json' },
     });
   }
+  const navTheme = theme.mode === 'creative' ? brief.visualSelection?.navigationStyle?.tone || '' : themeNavTheme(theme);
   const outputDir = path.resolve(options.outputDir || path.join('prd', project));
   const output = path.join(outputDir, 'build-plan.json');
   const guide = path.join(outputDir, 'authoring-context.md');
   const business = path.join(outputDir, 'business.json');
   const visual = path.join(outputDir, 'visual.json');
   const materializeCommand = `openyida design-plan materialize ${quoteArgument(output)} --business-file ${quoteArgument(business)} --visual-file ${quoteArgument(visual)} --json`;
-  if ([output, guide, business, visual].some(file => fs.existsSync(file))) {
+  if ([output, guide, business, visual, path.join(outputDir, require('./rebase').BASE_FILE)].some(file => fs.existsSync(file))) {
     throw new CliError('计划或编写上下文已存在，请继续补充现有文件', { code: 'DESIGN_PLAN_ALREADY_EXISTS' });
   }
   const scopedPages = list(brief.explicitScope?.pages);
@@ -215,7 +216,7 @@ function initialize(inputPath, options = {}) {
       ...(choice.creativeDirection ? { creativeDirection: choice.creativeDirection } : {}),
       forUser: { visualDirection: { ...(choice.visualDirection || { label: theme.label, description: theme.styleSummary }), source: visualSource },
         colorStrategy: { primaryColor: '', primaryColorName: '', source: '', usage: '', ...normalizeColorStrategy(choice.colorStrategy) },
-        navigationStyle: choice.navigationStyle || { structure: '', tone: '', source: '', selectionReason: '' },
+        navigationStyle: { structure: '', source: '', selectionReason: '', ...(choice.navigationStyle || {}), tone: navTheme, toneSource: theme.mode === 'creative' ? 'project_defined' : 'theme_derived' },
         pageApplications: pages.map(page => ({ pageId: page.pageId, firstScreenFocus: '', layout: '', responsive: '', primaryAction: '', acceptanceChecks: [],
           visualMemoryApplications: [], ...list(choice.pageApplications).find(item => item?.pageId === page.pageId) })),
         ...(choice.assetStrategy ? { assetStrategy: choice.assetStrategy } : {}),
@@ -233,9 +234,11 @@ function initialize(inputPath, options = {}) {
     `读取本上下文、编写契约和 business.json；按 authoring.pendingFields 补齐事实，保留 base 与已有需求。business facts 填写 overview、dataModels、businessFlows、pages 和可选 execution；视觉填写 visual.json。复核业务覆盖后设置片段 ready=true，再执行：${materializeCommand}。使用成功结果中的 HTML 路径展示“当前方案”，revision 仅放在内部确认字段，不写入用户可见标题、摘要或问题。视觉片段按每页实际任务补齐焦点、布局、主操作、响应式与验收；已完成的选择直接复用。`, '',
     '## 本轮编写重点', '设计功能范围、数据与规则、页面组织、关键交互和业务验收。页面 blocks 按优先顺序填写 {name,purpose}；CLI 派生默认内容优先级与内容层次，保留明确填写的独立设计。通用状态和验收检查由 CLI 补齐，interactionStates 与 acceptanceCriteria 填写项目差异。', '',
     '首页按使用者的主要任务选择：集中办事可用门户式工作台（workbench），单项任务可直达原生业务页；只有已确认的指标分析或投屏监控任务才规划 dashboard/screen。工作台按需求组织待办、操作队列、业务列表和常用入口，辅助统计不改变页面主任务。不得从后台身份、系统名称或暗色风格自动增加驾驶舱。完整规则见 yida-requirement-analysis/references/experience-groups.md 的“首页按任务选择”。', '',
-    '前台、后台及共用工作区都要确定默认页面、菜单及分组顺序、打开后的首屏任务。menu 数组记录展示顺序，defaultMenuKey 记录默认任务；按角色需求决定，不按资源创建先后排列。平台导航通过排序命令落实，自定义导航通过页面菜单落实，frontend-only 也必须完成入口排序与首页验收。', '',
-    '入口方案沿用 execution.entryRecommendation；逐入口补齐 role、menu 和 defaultMenuKey，访客端关联独立页面 sceneKey。任何身份的入口含 local 菜单时，entry.sceneKey 必须关联承载页面，menu.resource 等于页面 name，viewKey 非空。管理端可直接落到原生业务视图，不强制创建首页。所有叶子菜单按资源、视图和操作记录 access 权限依赖，平台导航排序从管理菜单派生。详见 yida-app/references/entry-navigation.md。', '',
-    '保留 visual.json 中 facts.visualStyle.forUser.visualDirection 和 navigationStyle 的对象结构，只补齐内部字段；前者包含 label/description，后者包含 structure=top|side 和 tone=light|dark，不改写为文字字符串。', '',
+    '无论是否分前后台，每个业务入口都要确定默认页面、菜单及分组顺序、打开后的首屏任务。menu 数组记录展示顺序，defaultMenuKey 记录默认任务；按角色需求决定，不按资源创建先后排列。平台导航通过排序命令落实，自定义导航通过页面菜单落实，frontend-only 也必须完成入口排序与首页验收。', '',
+    '入口方案沿用 execution.entryRecommendation：unified 表示不分前后台，service-management 表示分前后台，frontend-only 表示只有访问前台，backend-only 表示只有访问后台。向用户说明谁使用、看到什么、能做什么；只有前台且提交后需要处理时，在 reason 和业务流程中说明承接方式；逐入口补齐 role、menu 和 defaultMenuKey，前台关联独立页面 sceneKey。任何身份的入口含 local 菜单时，entry.sceneKey 必须关联承载页面，menu.resource 等于页面 name，viewKey 非空。管理端可直接落到原生业务视图，不强制创建首页。所有叶子菜单按资源、视图和操作记录 access 权限依赖，平台导航排序从管理菜单派生。详见 yida-app/references/entry-navigation.md。', '',
+    theme.mode === 'creative'
+      ? '保留 visual.json 中 facts.visualStyle.forUser.visualDirection 和 navigationStyle 的对象结构；自由创意需明确填写 structure=top|side 和 tone=light|dark，并配套导航 Token。'
+      : `保留 visual.json 中 facts.visualStyle.forUser.visualDirection 和 navigationStyle 的对象结构，只补齐内部字段；前者包含 label/description，后者只需维护 structure=top|side。tone=${navTheme} 由已选主题模板派生，不要修改。`, '',
     '## 页面模式', ...patterns.map(item => `- ${item.id}（${item.label}）：${item.mustKeep.join('；')}`), '',
     `## 已选风格：${theme.label}`, overview.trim(), '',
     '平台变量清单是基础契约，不是主题能力上限。visualStyle.tokens 可新增项目命名空间的材质、布局、字体、动效和组件状态变量，并在设计正文说明消费位置；平台变量可引用同一主题中已声明且无循环的扩展变量。不要为一次性页面样式强制新增 token。', '',
@@ -264,7 +267,8 @@ function initialize(inputPath, options = {}) {
   const visualPart = `${JSON.stringify({ base, ready: visualReady, facts: { visualStyle: plan.visualStyle } }, null, 2)}\n`;
   const authoring = authoringGuidance(plan, business, visual, businessReady, visualReady);
   const formatContext = ['## 输入格式示例', '示例仅说明格式，按当前业务填写。', '```json', JSON.stringify(authoring.examples, null, 2), '```', '', authoring.completion, ''].join('\n');
-  writeFiles([[output, `${JSON.stringify(plan, null, 2)}\n`], [guide, context + formatContext], [business, businessPart], [visual, visualPart]]);
+  const baseline = path.join(outputDir, require('./rebase').BASE_FILE);
+  writeFiles([[output, `${JSON.stringify(plan, null, 2)}\n`], [baseline, `${JSON.stringify({ schemaVersion: 1, base, plan }, null, 2)}\n`], [guide, context + formatContext], [business, businessPart], [visual, visualPart]]);
   return { success: true, input, output, context: guide, contract: path.join(ROOT, 'references/build-plan-compact-schema.md'), draft: true,
     materialize: { mode: 'complete_files_once', maxCalls: 1,
       shell: process.platform === 'win32' ? 'powershell' : 'posix',

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 };
 }
@@ -365,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 与入口管理菜单冲突，请修改入口菜单这一份源事实');
@@ -391,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 => {
@@ -485,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 },
@@ -546,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')),
@@ -619,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, '用于主要品牌操作和少量焦点，独立数据色和平台状态色保持各自语义。')}`, '',
@@ -719,7 +719,13 @@ function renderDesign(plan, options = {}) {
   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' });
@@ -744,8 +750,15 @@ function renderDesign(plan, options = {}) {
     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)/m,
-    (_, heading) => `${heading}\n${renderNavigationDesign(plan, navigationStyle, tokens)}\n\n`);
+  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];
@@ -825,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: [],
@@ -920,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' });
   }
@@ -928,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');
@@ -953,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;
 }