openyida 2026.9.19 → 2026.9.21

package/lib/core/locales/en.js

@@ -4,6 +4,13 @@
 'use strict';
 
 module.exports = {
+  design_plan: {
+    rebase_required: 'Before first materialization, repair the matching facts in business.json/visual.json and preserve the source baseline. If the source changed, add --rebase-parts to the original materialize command to reconcile against the saved baseline. Do not invent a digest, delete drafts, or run init again.',
+    baseline_missing: 'No trusted baseline matches these parts. Preserve the plan and facts; restore .build-plan-base.json from the original workspace. If unavailable, report the blocker instead of inventing a digest or rebuilding.',
+    rebase_stage_invalid: 'Rebasing is limited to drafts before first materialization. For presented or materialized plans use patch --materialize on the current build-plan.json, without merging initial parts again.',
+    rebase_conflict: 'The source and part changed the same field differently. Review conflicts and explicitly select the current or baseline value in the part before retrying; preserve other facts. No files were saved.',
+    repair_page_bindings: 'Repair pageApplications in visual.json to match customPageDetails in business.json one to one; exclude native forms. Each visualMemoryApplications must be an array; use [] when none apply. Keep the existing draft, fix the listed fields and retry the original command. Do not delete the directory or run init again.',
+  },
   design_document: {
     update_conflict: 'Cannot update {0} ({1}): the existing content differs from the last generated version. Read this section, reconcile the local edit with the plan source, and retry. No files were saved.',
     theme_css_invalid: 'Theme CSS near line {0} has an unclosed or mismatched delimiter, string, or comment. Fix it and retry.',
@@ -174,6 +181,8 @@ module.exports = {
   },
 
   cli: {
+    design_plan_entry_mode_required: 'Choose an entry mode: shared business pages (unified), separate frontend and business backend (service-management), frontend only (frontend-only), or business backend only (backend-only).',
+    design_plan_backend_only_roles: 'For backend-only, every entry must use role management.',
     design_plan_local_menu_binding: 'Local menu {0} requires a host page and viewKey: entry {1} sceneKey must match the page sceneKey, menu resource must equal the page name, and viewKey must be nonempty. This applies to every entry role.',
     design_plan_visual_object_required: '{0} must be an object, not a string or array. Preserve the structure generated by init and fill in its values. Example: {1}.',
     help: `
@@ -190,7 +199,7 @@ Commands:
   create-app --name "<name>" Create an app and output appType; configure theme resources and Logo source with update-app
   create-page <appType> "<pageName>" [--mode dashboard] [--hide-nav] Create a custom page, output pageId
   update-app <appType> [--name "..."] [--hide-app-nav|--show-app-nav] Update app info
-  create-form create <appType> "<formName>" <fieldsJSON> [--layout <layout>] [--theme <theme>] [--label-align <align>]  Create a form page
+  create-form create <appType> "<formName>" <fieldsJSON> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right]  Create a form page
   create-form update <appType> <formUuid> <changesJSON>        Update a form page
   list-forms <appType> [--keyword <text>]                      List forms/pages in an app
   get-schema <appType> <formUuid|--all>                        Get one form Schema or all form Schemas
@@ -848,12 +857,12 @@ Examples:
     changes_applied: '  Changes applied: {0}',
     create_post_failure_retry_advice: 'Do not repeat create directly. First run openyida list-forms {0} --keyword "{1}" to check for an existing same-title form; if this run already created a blank/existing form, prefer create-form update or a future --resume-form-uuid flow.',
     error: '\n❌ Error: {0}',
-    usage_create: 'Usage: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
+    usage_create: 'Usage: openyida create-form create <appType> <formTitle> <fieldsJsonFile> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right] [--icon auto|<iconName>] [--locale zh_CN|en_US|ja_JP] [--open|--no-open]',
     example_create: 'Example: openyida create-form create "APP_XXX" "Employee Info" .cache/openyida/forms/employee-fields.json',
     usage_update: 'Usage: openyida create-form update <appType> <formUuid> <changesJsonOrFile>',
     example_update: 'Example: openyida create-form update "APP_XXX" "FORM-YYY" \'[{"action":"add","field":{"type":"TextField","label":"Note"}}]\'',
     usage_label: 'Usage:',
-    usage_create_short: '  create: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
+    usage_create_short: '  create: openyida create-form create <appType> <formTitle> <fieldsJsonFile> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right] [--icon auto|<iconName>] [--locale zh_CN|en_US|ja_JP] [--open|--no-open]',
     usage_update_short: '  update: openyida create-form update <appType> <formUuid> <changesJsonOrFile> or --data-file <changesJsonOrFile>',
     resume_readback_failed: 'Unable to read the target form before resume.',
     resume_ownership_unverified: 'The target form does not belong to the requested app; resume stopped.',
@@ -1152,6 +1161,7 @@ Examples:
     theme_preset_conflict: 'A preset colour cannot be combined with custom CSS or themeColor. Use --colour custom or omit --colour.',
     custom_theme_color_required: 'colour=custom requires a theme file or a valid themeColor. Pass --theme-file or --theme-color.',
     theme_not_persisted: 'App theme readback failed or did not match the saved settings. The CSS resource binding is unverified. Inspect themeVerification and retry update-app <appType> --theme-file <css>; do not refresh the app.',
+    navigation_not_persisted: 'App navigation readback failed or did not match the requested settings. Navigation changes remain unverified. Inspect the expected values, actual values and readback error in navigationVerification, then check the current app settings.',
     usage: 'openyida update-app <appType> [--name "New Name"] [--theme-file ./theme.css] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape]',
     example: 'openyida update-app APP_XXX --theme-file ./app-theme.css --nav-theme light --logo-source appIcon --layout side',
     options: 'Options:\n  --name, -n      App name (specify at least one update field)\n  --desc, -d      App description\n  --icon          Icon name (e.g. xian-yingyong)\n  --icon-color    Icon color (default: #0089FF)\n  --colour, --theme  podBlue | podGreen | podOrange | deepBlue | teal | black | custom ...\n  --theme-color   Update the app primary color; the CSS primary color takes precedence when a theme file is supplied\n  --theme-file    Custom app theme CSS file (up to 20 MB; must declare --color-brand1-6)\n  --nav-theme     Navigation theme: light, dark, white, or gray\n  --logo-source   Navigation logo source: appIcon or customImage\n  --layout        Modern navigation layout: side, top, or l_shape\n  --hide-app-nav  Hide app navigation in visit mode, only for custom pages with self-rendered top/side navigation\n  --show-app-nav  Restore app navigation in visit mode',
@@ -2123,3 +2133,10 @@ module.exports.connector_e2e = {
 Object.assign(module.exports.process_errors || (module.exports.process_errors = {}), {
   action_config_invalid: 'Invalid approval action configuration for node {0}: {1}',
 });
+
+module.exports.cli_argument = { invalid: 'Invalid or missing argument value: {0}. Follow the command help.' };
+
+module.exports.sample_options = {
+  'theme_help': 'app-theme: --output is a CSS file; --design-file reads a completed design. Omitting it resets CSS. Set theme values in the design.',
+  'style_help': 'application-style: --style-id is required and accepts every catalog theme; --output is a directory for three files. Existing bundle files cause an error.'
+};

package/lib/core/locales/zh.js

@@ -4,6 +4,13 @@
 'use strict';
 
 module.exports = {
+  design_plan: {
+    rebase_required: '首次物化前请修正 business.json/visual.json 中的对应 facts，保留主计划基线。如果主计划已改变，在原 materialize 命令加 --rebase-parts，CLI 会根据保存的基线核对差异；不要手填 digest、删除草稿或重新 init。',
+    baseline_missing: '未找到与片段匹配的可信原始基线。保留当前计划与 facts；从原工作区恢复 .build-plan-base.json 后重试。无法恢复时明确告知用户阻塞，不伪造摘要或自动重建。',
+    rebase_stage_invalid: '基线恢复仅用于首次物化前的草稿。已展示或已物化方案请沿用当前 build-plan.json，通过 patch --materialize 调整，不再合并初始化片段。',
+    rebase_conflict: '主计划和片段对同一字段有不同修改。按 conflicts 核对并在片段中明确采用当前值或原基线值后重试；其他 facts 保留。本次未保存文件。',
+    repair_page_bindings: '按 business.json 的 customPageDetails 逐一修复 visual.json 的 pageApplications；原生表单不加入绑定。每项 visualMemoryApplications 必须为数组，无适用项用 []。保留现有草稿，按列出的字段修复后重试原命令；不要删除目录或重新 init。',
+  },
   design_document: {
     update_conflict: '无法更新 {0}（{1}）：现有内容与上次生成结果冲突。请读取这一部分，将本地修改与计划源对齐后重试；本次未保存任何文件。',
     theme_css_invalid: '主题 CSS 第 {0} 行附近存在未闭合或不匹配的括号、字符串或注释，请修复后重试。',
@@ -174,6 +181,8 @@ module.exports = {
   },
 
   cli: {
+    design_plan_entry_mode_required: '请明确入口方式：不分前后台（unified）、分前后台（service-management）、只有访问前台（frontend-only）或只有访问后台（backend-only）。',
+    design_plan_backend_only_roles: '只有访问后台（backend-only）时，每个入口的 role 必须为 management。',
     design_plan_local_menu_binding: '本地菜单 {0} 必须关联承载页面和 viewKey：入口 {1} 的 sceneKey 对应页面 sceneKey，菜单 resource 等于页面 name，并填写非空 viewKey。此规则适用于所有入口身份。',
     design_plan_visual_object_required: '{0} 必须为对象，不能写成字符串或数组。沿用 init 生成的字段结构，只补齐值；示例：{1}。',
     help: `
@@ -190,7 +199,7 @@ openyida - 宜搭命令行工具
   create-app --name "<名称>" 创建应用并输出 appType；主题资源与 Logo 来源使用 update-app 配置
   create-page <appType> "<页面名>" [--mode dashboard] [--hide-nav] 创建自定义页面，输出 pageId
   update-app <appType> [--name "..."] [--hide-app-nav|--show-app-nav] 更新应用信息
-  create-form create <appType> "<表单名>" <字段JSON> [--layout <布局>] [--theme <主题>] [--label-align <对齐>]  创建表单页面
+  create-form create <appType> "<表单名>" <字段JSON> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right]  创建表单页面
   create-form update <appType> <formUuid> <修改JSON>           更新表单页面
   list-forms <appType> [--keyword <关键词>]                    列出应用下的表单/页面
   get-schema <appType> <formUuid|--all>                        获取单个或全部表单 Schema
@@ -819,12 +828,12 @@ openyida - 宜搭命令行工具
     changes_applied: '  已应用变更: {0}',
     create_post_failure_retry_advice: '不要直接重复 create。先运行 openyida list-forms {0} --keyword "{1}" 确认同名表单；若是本轮创建的空白/已有表单，优先使用 create-form update 或后续 --resume-form-uuid 复用。',
     error: '\n❌ 错误: {0}',
-    usage_create: '用法: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
+    usage_create: '用法: openyida create-form create <appType> <formTitle> <fieldsJsonFile> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right] [--icon auto|<iconName>] [--locale zh_CN|en_US|ja_JP] [--open|--no-open]',
     example_create: '示例：openyida create-form create "APP_XXX" "员工信息登记" .cache/openyida/forms/employee-fields.json',
     usage_update: '用法: openyida create-form update <appType> <formUuid> <changesJsonOrFile>',
     example_update: '示例：openyida create-form update "APP_XXX" "FORM-YYY" \'[{"action":"add","field":{"type":"TextField","label":"备注"}}]\'',
     usage_label: '用法:',
-    usage_create_short: '  创建: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
+    usage_create_short: '  创建: openyida create-form create <appType> <formTitle> <fieldsJsonFile> [--layout single|double|card|section] [--theme default|compact|comfortable] [--label-align top|left|right] [--icon auto|<iconName>] [--locale zh_CN|en_US|ja_JP] [--open|--no-open]',
     usage_update_short: '  更新: openyida create-form update <appType> <formUuid> <changesJsonOrFile> 或 --data-file <changesJsonOrFile>',
     resume_readback_failed: '恢复前无法回读目标表单。',
     resume_ownership_unverified: '目标表单不属于指定应用，已停止恢复。',
@@ -1082,6 +1091,7 @@ openyida - 宜搭命令行工具
     theme_preset_conflict: '平台预置 colour 不能与自定义 CSS 或 themeColor 同传；请使用 colour=custom 或省略 --colour。',
     custom_theme_color_required: 'colour=custom 需要主题文件或有效 themeColor；请传 --theme-file 或 --theme-color。',
     theme_not_persisted: '应用主题保存后回读不一致或查询失败，CSS 资源尚未确认绑定。请查看 themeVerification，并使用 update-app <appType> --theme-file <css> 重试；不要重复创建应用。',
+    navigation_not_persisted: '应用导航保存后回读不一致或查询失败，导航设置尚未确认生效。请查看 navigationVerification 中的期望值、实际值和查询错误，核实应用当前设置。',
     usage: 'openyida update-app <appType> [--name "新名称"] [--theme-file ./theme.css] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape]',
     example: 'openyida update-app APP_XXX --theme-file ./app-theme.css --nav-theme light --logo-source appIcon --layout side',
     options: '选项:\n  --name, -n      应用名称（至少指定一个更新字段）\n  --desc, -d      应用描述\n  --icon          图标名称（如: xian-yingyong）\n  --icon-color    图标颜色（默认: #0089FF）\n  --colour, --theme  podBlue | podGreen | podOrange | deepBlue | teal | black | custom ...\n  --theme-color   更新应用主色；与主题文件同传时以 CSS 主色为准\n  --theme-file    自定义应用主题 CSS 文件（最大 20 MB，必须声明 --color-brand1-6）\n  --nav-theme     导航主题 light、dark、white 或 gray\n  --logo-source   导航 Logo 来源 appIcon 或 customImage\n  --layout        新版导航布局 side、top 或 l_shape\n  --hide-app-nav  隐藏访问态应用导航，仅在自定义页自绘顶部/侧边导航壳时使用\n  --show-app-nav  恢复访问态应用导航',
@@ -2077,3 +2087,10 @@ module.exports.connector_e2e = {
 Object.assign(module.exports.process_errors || (module.exports.process_errors = {}), {
   action_config_invalid: '节点 {0} 的审批动作配置无效：{1}',
 });
+
+module.exports.cli_argument = { invalid: '参数无效或缺少值：{0}。请按命令帮助填写。' };
+
+module.exports.sample_options = {
+  'theme_help': 'app-theme：--output 指向 CSS 文件；--design-file 读取已完成的设计。省略设计文件会重置 CSS，主题值通过设计填写。',
+  'style_help': 'application-style：--style-id 必填，支持目录中全部主题；--output 指向目录，输出三文件，有同名文件时报错。'
+};

package/lib/core/sample.js

@@ -18,6 +18,7 @@
 const fs = require('fs');
 const path = require('path');
 const { CliError } = require('./cli-error');
+const { t } = require('./i18n');
 
 // ── Sample 索引表 ─────────────────────────────────────────────────────
 
@@ -111,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。',
 };
 
@@ -148,6 +149,9 @@ 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')}`);
 }
 
 /**
@@ -162,23 +166,29 @@ 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;
   let designFile;
+  let styleId;
   const variables = {};
 
   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];
+      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;
     }
@@ -192,19 +202,15 @@ 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;
     }
   }
 
-  return { outputPath, variables, designFile };
+  return { outputPath, variables, designFile, styleId };
 }
 
 /**
@@ -234,6 +240,19 @@ async function run(args) {
   }
 
   const [skill, name, ...rest] = args;
+  if (skill === 'yida-design' && name === 'application-style') {
+    const options = parseOptions(rest, path.join(process.cwd(), '.cache/samples/application-style'));
+    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;
+  }
+  if (rest.includes('--style-id')) {throw new CliError(t('design_document.invalid', '--style-id', 'APPLICATION_STYLE_SAMPLE_INVALID'), { code: 'APPLICATION_STYLE_SAMPLE_INVALID' });}
 
   const { c, error: chalkError, success: chalkSuccess, hint: chalkHint } = require('./chalk');
 
@@ -275,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/document.js

@@ -376,6 +376,7 @@ function validateDesignDocument(markdown, options = {}) {
   if (!/^#[\da-f]{6}$/i.test(profile.themeColor) || profile.themeColor.toUpperCase() !== tokens['--color-brand1-6'].toUpperCase()) {
     invalid('themeProfile.themeColor', 'PRIMARY_COLOR_MISMATCH');
   }
+  if (!['light', 'dark'].includes(profile.contentTone)) {invalid('themeProfile.contentTone', 'LIGHT_OR_DARK_REQUIRED');}
   if (!['light', 'dark'].includes(profile.navTheme)) {invalid('themeProfile.navTheme', 'LIGHT_OR_DARK_REQUIRED');}
   if (!['app-custom-theme-file', 'current-app-theme'].includes(profile.themeDelivery)) {invalid('themeProfile.themeDelivery', 'INVALID_THEME_DELIVERY');}
   if (typeof profile.themeFile !== 'string') {invalid('themeProfile.themeFile', 'STRING_REQUIRED');}

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 : [];
@@ -57,7 +57,8 @@ function catalog() {
   const { themes, pagePatterns } = loadCatalog();
   return {
     success: true,
-    themes: themes.map(({ themeId, label, templatePath, styleSummary }) => ({ themeId, label, templatePath, styleSummary })),
+    themes: themes.filter(theme => theme.mode !== 'creative').map(theme => ({ ...theme })),
+    creativeOption: themes.find(theme => theme.mode === 'creative'),
     pagePatterns: pagePatterns.map(({ id, label, mustKeep }) => ({ id, label, mustKeep })),
   };
 }
@@ -138,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);
@@ -211,9 +213,10 @@ function initialize(inputPath, options = {}) {
       ...(choice.tokens ? { tokens: choice.tokens } : {}),
       ...(choice.evidence ? { evidence: choice.evidence } : {}),
       ...(choice.constraints ? { constraints: choice.constraints } : {}),
+      ...(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 } : {}),
@@ -231,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。', '',
@@ -257,11 +262,13 @@ function initialize(inputPath, options = {}) {
     && ['top', 'side'].includes(selectedVisual.navigationStyle.structure)
     && ['light', 'dark'].includes(selectedVisual.navigationStyle.tone)
     && ['label', 'description'].every(key => typeof selectedVisual.visualDirection[key] === 'string' && selectedVisual.visualDirection[key].trim())
-    && !collectIssues(plan).some(issue => issue.path.startsWith('visualStyle.forUser.pageApplications['));
+    && !collectIssues(plan).some(issue => issue.path.startsWith('visualStyle.forUser.pageApplications[')
+      || issue.path.startsWith('visualStyle.creativeDirection.') || issue.path.startsWith('visualStyle.tokens.'));
   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',