openyida 2026.9.21 → 2026.9.22-beta.2

package/lib/core/redact.js

@@ -76,24 +76,19 @@ function redactSensitive(value, options = {}) {
   }
   seen.add(value);
 
-  try {
-    if (Array.isArray(value)) {
-      return value.map(item => redactSensitive(item, { seen }));
-    }
+  if (Array.isArray(value)) {
+    return value.map(item => redactSensitive(item, { seen }));
+  }
 
-    if (!isPlainObject(value)) {
-      return value;
-    }
+  if (!isPlainObject(value)) {
+    return value;
+  }
 
-    const redacted = {};
-    for (const [entryKey, entryValue] of Object.entries(value)) {
-      redacted[entryKey] = redactSensitive(entryValue, { seen, key: entryKey });
-    }
-    return redacted;
-  } finally {
-    // Only ancestors form a cycle; siblings may share the same diagnostic object.
-    seen.delete(value);
+  const redacted = {};
+  for (const [entryKey, entryValue] of Object.entries(value)) {
+    redacted[entryKey] = redactSensitive(entryValue, { seen, key: entryKey });
   }
+  return redacted;
 }
 
 function safeJsonStringify(value, spacing = 2) {

package/lib/core/sample.js

@@ -18,7 +18,6 @@
 const fs = require('fs');
 const path = require('path');
 const { CliError } = require('./cli-error');
-const { t } = require('./i18n');
 
 // ── Sample 索引表 ─────────────────────────────────────────────────────
 
@@ -52,10 +51,7 @@ const SAMPLES = {
     'canvas-form-drawer': 'canvas-form-drawer.canvas.jsx',
     'form-open-container': 'canvas-form-drawer.canvas.jsx',
     'canvas-dialog': 'canvas-dialog.canvas.jsx',
-    'canvas-theme': 'canvas-theme-provider.template.jsx',
-    'canvas-navigation': 'canvas-navigation.jsx',
-    'canvas-view-state': 'canvas-view-state.jsx',
-    'canvas-admin-entry': 'canvas-admin-entry.jsx',
+    'canvas-theme': 'canvas-form-drawer.canvas.jsx',
     'canvas-nav-side': 'canvas-nav/side.jsx',
     'canvas-nav-top': 'canvas-nav/top.jsx',
     'canvas-nav-mixed': 'canvas-nav/mixed.jsx',
@@ -77,7 +73,6 @@ const SAMPLE_SOURCE_DIRECTORIES = {
 };
 
 const SAMPLE_SOURCE_FILES = {
-  'openyida-page-template/canvas-theme': path.join(__dirname, '../../yida-skills/skills/yida-canvas-custom-page/scripts/canvas-theme-provider.template.jsx'),
   'yida-design/app-theme': path.join(
     __dirname,
     '..',
@@ -106,13 +101,9 @@ const SAMPLE_OUTPUT_FILENAMES = {
 };
 
 const SAMPLE_HINTS = {
-  'openyida-page-template/canvas-admin-entry': '已包含统一跳转 helper；在 CanvasThemeProvider 内渲染 CanvasAdminWorkbenchButton，填写当前 appType 与真实 workbenchFormUuid。身份读取当前应用 loginUser.isAppAdmin，未知时隐藏；默认不跳开发后台或猜测管理首页。',
-  'openyida-page-template/canvas-navigation': '先从资源回读填写 appType、目标类型与页面 ID；本页 Tab 用 selectView，独立前台用 custom，管理入口用 page，表单入口接 openForm；按钮和链接共用 buildCanvasPageUrl。',
-  'openyida-page-template/canvas-theme': '以 CanvasThemeProvider 包住业务组件；Tabs 用于内容切换，Segmented/Radio 用于筛选，Button 用于动作。默认轻底选中态与可读文字，controls 可供自绘控件复用；避免内层固定色覆盖。保留内置加载遮罩防闪边样式；旧页面需更新 Provider 并重新发布。',
-  '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-page-bg-color，文字使用 --color-text1-4，background 可按设计覆盖。',
+  'openyida-page-template/canvas-nav-content': '合并 CanvasNavigationContent；顶部导航传 navigation，工作台传 children，原生页传 iframeSrc 和 title；宿主已分配高度时显式传 height。',
+  'openyida-page-template/canvas-nav-data': '向 loadCanvasNavigation 传入 PRD 规划的 items，通常工作台在首位；接口只过滤不可见入口，保留规划顺序与分组。',
+  'openyida-page-template/form-open-container': '将 import、抽屉组件和辅助函数合并到现有 Canvas 页面；表单使用 useYidaFormOpen，其他内容使用 CanvasDrawer。',
   'yida-design/app-theme': '已复制应用主题模板；请由 yida-design 按 design.md 定点修改需要变化的 token。',
 };
 
@@ -149,9 +140,6 @@ 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')}`);
 }
 
 /**
@@ -166,29 +154,23 @@ function ensureDirectoryExists(filePath) {
 }
 
 /**
- * 解析 sample 输出路径、设计文件、主题 ID 与模板变量；拒绝未声明参数。
+ * 解析 --output 与 --var KEY=VALUE 参数。
  * @param {string[]} rest
  * @param {string} defaultOutputPath
- * @returns {{ outputPath: string, variables: Object, designFile?: string, styleId?: string }}
+ * @returns {{ outputPath: string, variables: Object }}
  */
 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;
     }
@@ -202,15 +184,19 @@ function parseOptions(rest, defaultOutputPath) {
     if (arg === '--var' && rest[i + 1]) {
       const pair = rest[i + 1];
       const eqIndex = pair.indexOf('=');
-      if (eqIndex <= 0 || !pair.slice(0, eqIndex).trim()) {invalid();}
-      const key = pair.slice(0, eqIndex).trim();
-      variables[key] = pair.slice(eqIndex + 1);
+      if (eqIndex > 0) {
+        const key = pair.slice(0, eqIndex).trim();
+        const value = pair.slice(eqIndex + 1);
+        if (key) {
+          variables[key] = value;
+        }
+      }
       i++;
       continue;
     }
   }
 
-  return { outputPath, variables, designFile, styleId };
+  return { outputPath, variables, designFile };
 }
 
 /**
@@ -240,19 +226,6 @@ 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');
 
@@ -283,8 +256,7 @@ async function run(args) {
   const defaultOutputPath = path.join(process.cwd(), '.cache', 'samples', outputFilename);
   const { outputPath, variables, designFile } = parseOptions(rest, defaultOutputPath);
   const isNavSample = skill === 'openyida-page-template' && name.startsWith('canvas-nav-');
-  const prefixPath = sampleKey === 'openyida-page-template/canvas-admin-entry' ? path.join(path.dirname(sourcePath), 'canvas-navigation.jsx')
-    : isNavSample && !['canvas-nav-tabs', 'canvas-nav-data', 'canvas-nav-content'].includes(name) ? path.join(path.dirname(sourcePath), 'shared.jsx') : null;
+  const prefixPath = isNavSample && !['canvas-nav-tabs', 'canvas-nav-data', 'canvas-nav-content'].includes(name) ? path.join(path.dirname(sourcePath), 'shared.jsx') : null;
   const sidebarPath = isNavSample && ['canvas-nav-side', 'canvas-nav-mixed'].includes(name) ? path.join(path.dirname(sourcePath), 'sidebar.jsx') : null;
   if ([sourcePath, prefixPath, sidebarPath, designFile].filter(Boolean).some(file => path.resolve(outputPath) === path.resolve(file))) {
     throw new CliError('输出路径不能覆盖模板或 design.md', { code: 'SAMPLE_OUTPUT_CONFLICT' });
@@ -294,25 +266,14 @@ 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' });
     }
     const template = fs.readFileSync(sourcePath, 'utf8');
-    // Template-only exports must pass the same checks as generated/uploaded CSS.
-    require('../app/custom-theme').validateThemeCssContent(template);
     if (designFile) {
       const { applyDesignTokens, readDesignTokens } = require('../app/theme-from-design');
       const markdown = fs.readFileSync(designFile, 'utf8');
-      // Both authoring modes use the same final-document contract. Older token-
-      // only files still support incremental theme updates without migration.
-      const frontmatter = /^\uFEFF?---\r?\n([\s\S]*?)\r?\n---/.exec(markdown)?.[1] || '';
-      if (/^["']?schemaVersion["']?\s*:/m.test(frontmatter)) {
-        require('../design/document').validateDesignDocument(markdown);
-      }
       const existing = fs.existsSync(outputPath);
       const previous = existing && fs.existsSync(snapshotPath) ? fs.readFileSync(snapshotPath, 'utf8') : undefined;
       const css = applyDesignTokens(existing ? fs.readFileSync(outputPath, 'utf8') : template, markdown, previous);
@@ -334,8 +295,12 @@ async function run(args) {
     const content = [prefixPath, sidebarPath, sourcePath].filter(Boolean).map(file => fs.readFileSync(file, 'utf8')).join('\n');
     fs.writeFileSync(outputPath, applyTemplateVariables(content, variables), 'utf8');
   } else if (sampleKey === 'openyida-page-template/canvas-theme') {
-    const { buildApplicationProvider } = require('../../yida-skills/skills/yida-canvas-custom-page/scripts/build-canvas-theme');
-    fs.writeFileSync(outputPath, buildApplicationProvider(), 'utf8');
+    const sourceContent = fs.readFileSync(sourcePath, 'utf8');
+    const fragment = sourceContent.match(/\/\/ @openyida-canvas-theme:start\r?\n([\s\S]*?)\/\/ @openyida-canvas-theme:end/);
+    if (!fragment) {
+      throw new CliError('Canvas theme fragment missing', { code: 'SAMPLE_FRAGMENT_MISSING' });
+    }
+    fs.writeFileSync(outputPath, "import React from 'react';\n\n" + fragment[1], 'utf8');
   } else if (sampleKey === 'openyida-page-template/form-open-container') {
     const sourceContent = fs.readFileSync(sourcePath, 'utf8');
     const fragment = sourceContent.match(/\/\/ @openyida-form-drawer:start\r?\n([\s\S]*?)\/\/ @openyida-form-drawer:end/);
@@ -343,25 +308,18 @@ async function run(args) {
       throw new CliError('抽屉模板缺少共享代码片段', { code: 'SAMPLE_FRAGMENT_MISSING' });
     }
     fs.writeFileSync(outputPath, applyTemplateVariables(fragment[1], variables), 'utf8');
+  } else if (Object.keys(variables).length === 0) {
+    fs.copyFileSync(sourcePath, outputPath);
   } else {
-    const { assembleApplicationTheme } = require('../../yida-skills/skills/yida-canvas-custom-page/scripts/build-canvas-theme');
     const sourceContent = fs.readFileSync(sourcePath, 'utf-8');
-    const outputContent = applyTemplateVariables(assembleApplicationTheme(sourceContent), variables);
+    const outputContent = applyTemplateVariables(sourceContent, variables);
     fs.writeFileSync(outputPath, outputContent, 'utf-8');
   }
 
   chalkSuccess(`模板文件已复制到：${c.cyan}${outputPath}${c.reset}`);
-  const navigationHint = isNavSample
-    ? '平台导航页默认只实现业务内容，不合并第二套应用菜单；页内 Tab 仅切当前任务的分类或状态。确认独立入口或应用级自绘导航后再使用导航壳片段。'
-    : '';
-  const defaultHint = isNavSample
-    ? '已输出所选导航组件；合并 import 后接入 items、activeKey、onSelect 和现有页面内容，样式直接消费应用 token。'
-    : '请读取文件并按当前业务需求修改；发布前移除模板标记、示例数据和占位文案。';
-  const sampleHint = SAMPLE_HINTS[sampleKey] || defaultHint;
-  const hint = designFile
-    ? '已按 design.md 应用 token；使用 --theme-file 在应用级配置主题。'
-    : navigationHint + sampleHint;
-  chalkHint(hint);
+  chalkHint(designFile ? '已按 design.md 应用 token；使用 --theme-file 在应用级配置主题。' :
+    SAMPLE_HINTS[sampleKey] || (isNavSample ? '已输出所选导航组件；合并 import 后接入 items、activeKey、onSelect 和现有页面内容，样式直接消费应用 token。' :
+      '请读取文件并按当前业务需求修改；发布前移除模板标记、示例数据和占位文案。'));
 }
 
 module.exports = { run, applyTemplateVariables, parseOptions };

package/lib/core/utils.js

@@ -842,6 +842,7 @@ function loadTokenAuthData(projectRoot, defaultBaseUrl) {
       auth_source: session.auth_source || 'token',
       auth_store: session.auth_store,
       auth_profile: session.auth_profile,
+      credential_source: session.credential_source,
       persistence_scope: session.persistence_scope,
       user_auth_store_writable: session.user_auth_store_writable,
       warning: session.warning,
@@ -1722,6 +1723,8 @@ async function requestWithAutoLogin(requestFn, authRef) {
       const refreshResult = await tokenRefresh({
         projectRoot: authRef && authRef.projectRoot,
         baseUrl: currentBaseUrl,
+        ...(currentAuthData && currentAuthData.credential_source === 'dws'
+          ? { authProfile: currentAuthData.auth_profile } : {}),
         clientId: currentAuthData && (currentAuthData.client_id || currentAuthData.clientId),
       });
       if (!refreshResult || refreshResult.ok === false || !refreshResult.access_token) {
@@ -1811,6 +1814,7 @@ function normalizeRefreshedTokenAuthData(refreshResult, fallbackBaseUrl) {
     auth_source: refreshResult.auth_source || 'token',
     auth_store: refreshResult.auth_store,
     auth_profile: refreshResult.auth_profile,
+    credential_source: refreshResult.credential_source,
     persistence_scope: refreshResult.persistence_scope,
     user_auth_store_writable: refreshResult.user_auth_store_writable,
     warning: refreshResult.warning,

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

@@ -3,16 +3,15 @@
 const { CliError } = require('../core/cli-error');
 const { materialize } = require('./materialize');
 const { patchPlan } = require('./patch');
-const { initialize, catalog } = require('./init');
+const { initialize } = require('./init');
 const { preview } = require('./preview');
 
 function usage() {
   return [
     '用法：',
-    '  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>] [--rebase-parts] [--check] [--json]',
+    '  openyida design-plan materialize <build-plan.json> [--from-preview | --business-file <json> --visual-file <json>] [--output-dir <dir>] [--check] [--json]',
     '  openyida design-plan patch <build-plan.json> --set <path=value> [--set <path=value> ...] [--materialize] [--output-dir <dir>] [--json]',
   ].join('\n');
 }
@@ -50,63 +49,18 @@ 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')) {
     console.log(usage());
     return;
   }
-  if (!['catalog', 'init', 'preview', 'materialize', 'patch'].includes(subcommand)) {
+  if (!['init', 'preview', 'materialize', 'patch'].includes(subcommand)) {
     throw new CliError(`未知 design-plan 子命令：${subcommand}`, {
       code: 'DESIGN_PLAN_UNKNOWN_SUBCOMMAND',
       usage: usage(),
     });
   }
-  if (subcommand === 'catalog') {
-    assertKnownOptions(subcommand, args.slice(1));
-    console.log(JSON.stringify(catalog(), null, 2));
-    return;
-  }
   const input = args[1];
   if (!input || input.startsWith('--')) {
     throw new CliError(`${subcommand} 缺少 ${subcommand === 'init' ? 'requirement-brief.json' : 'build-plan.json'} 路径`, {
@@ -115,14 +69,13 @@ 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'), rebaseParts: options.includes('--rebase-parts'), fromPreview: options.includes('--from-preview'), businessFile: optionValue(options, '--business-file'), visualFile: optionValue(options, '--visual-file') })
+        ? materialize(input, { outputDir, check: options.includes('--check'), 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/init.js

@@ -2,34 +2,16 @@
 
 const fs = require('fs');
 const path = require('path');
-const { getVisualDecisionPolicy } = require('./visual-policy');
 const { CliError } = require('../core/cli-error');
 const { readJson, writeFiles } = require('./files');
 const { planBase } = require('./parallel');
-const { collectIssues } = require('./validate');
-const { assertVisualFieldObjects } = require('./normalize');
 
-const { PLAN_SKILL_ROOT: ROOT, loadThemeIndex, themeTemplatePath, themeNavTheme } = require('./themes');
+const ROOT = path.resolve(__dirname, '../../yida-skills/skills/yida-design/sub_skill/yida-design-plan');
 
 function list(value) {
   return Array.isArray(value) ? value : [];
 }
 
-function normalizeColorStrategy(value) {
-  if (value === undefined || value === null) {return {};}
-  if (typeof value === 'string') {return { usage: value };}
-  if (typeof value === 'object' && !Array.isArray(value)) {return value;}
-  throw new CliError('visualSelection.colorStrategy 应为配色对象或文字说明', {
-    code: 'DESIGN_PLAN_INVALID_COLOR_STRATEGY',
-    details: { field: 'visualSelection.colorStrategy', expected: 'object|string' },
-  });
-}
-
-function quoteArgument(value) {
-  const escaped = process.platform === 'win32' ? value.replace(/'/g, "''") : value.replace(/'/g, '\'"\'"\'');
-  return `'${escaped}'`;
-}
-
 function customScene(scene) {
   return !['form', 'process-form', 'report'].includes(scene?.kind);
 }
@@ -46,62 +28,6 @@ function scopeEntryMatchesScene(entry, scene) {
   return candidate && [scene?.key, scene?.name].includes(candidate);
 }
 
-function loadCatalog() {
-  return {
-    themes: loadThemeIndex().themes,
-    pagePatterns: readJson(path.join(ROOT, 'templates/page-patterns/index.json')).patterns,
-  };
-}
-
-function catalog() {
-  const { themes, pagePatterns } = loadCatalog();
-  return {
-    success: true,
-    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 })),
-  };
-}
-
-// Format examples stay outside business facts, so examples never become requirements.
-function authoringGuidance(plan, business, visual, businessReady, visualReady) {
-  const color = plan.visualStyle.forUser.colorStrategy;
-  const pendingFields = collectIssues(plan).map(issue => ({
-    file: issue.path.startsWith('visualStyle.') ? visual : business,
-    path: `facts.${issue.path}`,
-    message: issue.message,
-  }));
-  for (const [file, ready] of [[business, businessReady], [visual, visualReady]]) {
-    if (!ready) {pendingFields.push({ file, path: 'ready', message: '完成本片段的业务或视觉内容后设置为 true' });}
-  }
-  return {
-    visualDecision: getVisualDecisionPolicy(),
-    pendingFields,
-    completion: '保留 base 和已有事实；按待补字段完成内容并复核业务覆盖，将完成的片段设为 ready=true，再执行 materialize.command。待补字段为初始化检查结果，最终生成时继续执行完整校验。',
-    examples: {
-      colorStrategy: { primaryColor: color.primaryColor, primaryColorName: color.primaryColorName, usage: color.usage },
-      blocks: [{ name: '客房选择', purpose: '按日期和人数筛选可预约房型' }, { name: '预约结果', purpose: '查看提交结果，失败时保留已填内容并显示原因' }],
-      field: { name: '订单编号', type: '单行文本', required: true, defaultOrOptions: '', relation: '', group: '基本信息', description: '订单唯一标识' },
-      businessFragment: { facts: {
-        overview: { businessGraph: { relations: [{ from: '订单', to: '客户', label: '归属客户', description: '一个客户可以拥有多笔订单' }] } },
-        businessFlows: [{ name: '订单审核', type: '审批', description: '订单提交后审核', trigger: '订单提交', nodes: ['提交', '审批'], rules: ['审批通过后进入执行'] }],
-        pages: { customPageDetails: [{ pageId: 'orders', dataBinding: 'form', dataSources: ['订单'] }] },
-        execution: {
-          sampleDataPlan: [{ form: '订单', records: [{ '订单编号': 'ORDER-001' }] }],
-          interactionStates: { empty: '展示空态和新建入口', loading: '显示加载状态', error: '保留输入并提示失败原因' },
-        },
-      } },
-      skippedSampleDataPlan: { path: 'facts.execution.sampleDataPlan', value: [{ form: '订单', skipReason: '填写本项目跳过示例数据的原因' }] },
-      referenceRules: 'relations.from/to、field.relation、dataSources 必须填写 dataModels 中的完整名称；关系描述写 description，不放进引用值。示例中的模型名和流程只说明格式，无此业务时使用空数组。',
-      pageApplication: { pageId: '填写实际页面ID', firstScreenFocus: '待审批订单位于首屏左上，数量与最临近截止时间组成焦点',
-        layout: '桌面主列放待审批表格，右列放当前订单详情；两列比例为 2:1，区块间距 24px',
-        primaryAction: '待审批表格每行末尾提供审批按钮，打开该订单对应的原生审批页面，处理成功后刷新列表',
-        responsive: '宽度小于 768px 时详情移至表格下方，行内次操作收入菜单，主操作保持可见',
-        acceptanceChecks: ['首屏待审批数量与表格筛选结果一致', '窄屏下订单号和主操作无需横向滚动即可查看'] },
-    },
-  };
-}
-
 function initialize(inputPath, options = {}) {
   const input = path.resolve(inputPath);
   const brief = readJson(input, 'requirement-brief.json');
@@ -131,22 +57,20 @@ function initialize(inputPath, options = {}) {
     || (brief.navigation.type === 'custom' && !['side', 'top', 'mixed', 'dock'].includes(brief.navigation.variant))) {
     throw new CliError('请记录已确认的导航类型；自定义导航还需 variant: side/top/mixed/dock', { code: 'DESIGN_PLAN_NAVIGATION_REQUIRED' });
   }
-  const { themes, pagePatterns: patterns } = loadCatalog();
+  const themes = readJson(path.join(ROOT, 'templates/design-themes/index.json')).themes;
   const themeId = options.themeId || brief.visualSelection?.themeId;
   const theme = themes.find(item => item.themeId === themeId);
   if (!theme) {
     throw new CliError('请通过 --theme-id 指定已选风格对应的主题', {
-      code: 'DESIGN_PLAN_THEME_UNKNOWN', details: { themes: themes.map(({ themeId, label }) => ({ themeId, label })), catalogCommand: 'openyida design-plan catalog --json' },
+      code: 'DESIGN_PLAN_THEME_UNKNOWN', details: { themes: themes.map(({ themeId, label }) => ({ themeId, label })) },
     });
   }
-  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, path.join(outputDir, require('./rebase').BASE_FILE)].some(file => fs.existsSync(file))) {
+  if ([output, guide, business, visual].some(file => fs.existsSync(file))) {
     throw new CliError('计划或编写上下文已存在，请继续补充现有文件', { code: 'DESIGN_PLAN_ALREADY_EXISTS' });
   }
   const scopedPages = list(brief.explicitScope?.pages);
@@ -158,13 +82,11 @@ function initialize(inputPath, options = {}) {
     const { key, ...facts } = source;
     delete facts.kind;
     return { pageId: key || `page-${index + 1}`, sceneKey: key || `page-${index + 1}`, name: '', primaryTask: '',
-      primaryUsers: [], positioning: '', blocks: [], firstScreenStructure: '', signatureInteraction: '',
-      layoutPattern: { id: 'custom-page-pattern', reason: '', adaptations: [] },
+      primaryUsers: [], positioning: '', contentPriority: [], blocks: [], firstScreenStructure: '', signatureInteraction: '',
+      layoutPattern: { id: 'custom-page-pattern', reason: '', adaptations: [] }, contentRichness: { contentLayers: [] },
       density: '', permissionSummary: '', dataBinding: '', dataSources: [], ...facts };
   });
   const choice = brief.visualSelection || {};
-  assertVisualFieldObjects(choice, { prefix: 'visualSelection', sourcePath: input });
-  const visualSource = choice.visualDirection?.source || 'ai_default';
   const app = brief.resourceContext?.app || brief.resourceContext || {};
   const appConfig = { navigationType: brief.navigation.type };
   for (const key of ['appType', 'corpId', 'baseUrl']) {if (app[key]) {appConfig[key] = app[key];}}
@@ -201,7 +123,6 @@ function initialize(inputPath, options = {}) {
       return { ...model, name: model.name, formType: model.formType || '宜搭表单', description: model.description || '', fields: Array.isArray(model.fields) ? model.fields : [] };
     }), businessFlows: [], pages: { customPageDetails: pages }, execution: {
       appConfig,
-      ...(!resourceOnly && brief.entryRecommendation ? { entryRecommendation: JSON.parse(JSON.stringify(brief.entryRecommendation)) } : {}),
       explicitScope: { ...normalizedScope, navigation: brief.navigation },
       ...(resourceOnly ? {
         sampleDataPlan: modelInputs
@@ -213,37 +134,27 @@ 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: { 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 } : {}),
-        ...(choice.iconSystem ? { iconSystem: choice.iconSystem } : {}) },
-      internal: { selectedTheme: { themeId, source: visualSource } },
+      forUser: { visualDirection: choice.visualDirection || { label: theme.label, description: theme.description, source: 'user_selected' },
+        colorStrategy: { primaryColor: '', primaryColorName: '', source: '', usage: '', surfaceTone: 'brand-tinted', ...choice.colorStrategy },
+        navigationStyle: choice.navigationStyle || { structure: '', tone: '', source: '', selectionReason: '' },
+        pageApplications: pages.map(page => ({ pageId: page.pageId, visualMemoryApplications: [] })),
+        ...(choice.assetStrategy ? { assetStrategy: choice.assetStrategy } : {}) },
+      internal: { selectedTheme: { themeId, source: 'user_selected' } },
     },
     askhuman: {},
   };
   // Keep the business description and visual memory rules verbatim; the renderer consumes the full template.
-  const template = fs.readFileSync(themeTemplatePath(theme), 'utf8');
-  const overview = template.match(/^## 1\. 风格摘要\n([\s\S]*?)(?=^## |$(?![\s\S]))/m)?.[0];
-  if (!overview) {throw new CliError('主题缺少风格摘要，请检查模板', { code: 'DESIGN_PLAN_THEME_CONTEXT_MISSING' });}
+  const template = fs.readFileSync(path.join(ROOT, theme.templatePath), 'utf8');
+  const overview = template.match(/^## 设计总览\n([\s\S]*?)(?=^## |$(?![\s\S]))/m)?.[0];
+  if (!overview) {throw new CliError('主题缺少设计总览，请检查模板', { code: 'DESIGN_PLAN_THEME_CONTEXT_MISSING' });}
+  const patterns = readJson(path.join(ROOT, 'templates/page-patterns/index.json')).patterns;
   const context = [
     '# 计划编写上下文', '', `需求事实：${input}`, `计划目录：${outputDir}`, '',
-    `读取本上下文、编写契约和 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：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} 由已选主题模板派生，不要修改。`, '',
+    `先读 build-plan-compact-schema.md，再读 init 已创建的 business.json；保留 base 并一次补完 facts 后写回。business facts 只能包含 overview、dataModels、businessFlows、pages 和可选 execution，不得写 visualStyle。写完后只执行一次：openyida design-plan materialize ${output} --business-file ${business} --visual-file ${visual} --json。标准首版禁止先调用 --from-preview、preview、--check 或无参数 materialize，也不要用 Glob 或额外 Read 检查产物；成功结果已返回 HTML 路径和 revision。只有视觉选择不完整或存在品牌稿、参考图、逐页特殊视觉要求时才补充视觉。保留页面 ID 与已有需求细节。`, '',
     '## 页面模式', ...patterns.map(item => `- ${item.id}（${item.label}）：${item.mustKeep.join('；')}`), '',
     `## 已选风格：${theme.label}`, overview.trim(), '',
-    '平台变量清单是基础契约，不是主题能力上限。visualStyle.tokens 可新增项目命名空间的材质、布局、字体、动效和组件状态变量，并在设计正文说明消费位置；平台变量可引用同一主题中已声明且无循环的扩展变量。不要为一次性页面样式强制新增 token。', '',
-    'Fast 和 Plan 使用同一主题的颜色、圆角、间距和组件规则。主色按主题公式推导；已选方向承诺的画布、卡片、填充、字体或辅助色与模板不同时，由设计者将差异写入 visualStyle.tokens。description 和 colorStrategy.usage 不会自动转换为 CSS；物化后核对主题变量，再交接页面引用，不能在各页另写固定基础色盘。详见 yida-design/references/application-theme-consistency.md。根背景的渐变使用 --pod-app-root-bg-image，单页装饰写入该页设计。', '',
-    '完整主题的 token、组件和状态规则由 CLI 注入 design.md。逐页补齐 pageApplications.firstScreenFocus、layout、responsive 和 acceptanceChecks，并在 primaryAction 写明真实主操作及所在位置；这些字段记录基于真实业务和所选主题做出的最终设计决定，不能仅写继承主题。旧计划缺项时继续补充原计划，预览可保持草稿，最终物化前必须完整。', '',
+    '用户确认的配色优先于模板固定灰阶：surfaceTone=brand-tinted 将浅色页面、填充和边界与主色协调，正文保留中性层级；用户明确只改强调色、保持中性或忠实参考配色时设为 theme。深色表面保留原层级。不要为了模板的无彩限制撤掉用户要求的品牌氛围。', '',
+    '完整主题的 token、组件、状态和响应式规则由 CLI 注入 design.md；调整具体组件时按需读取对应模板章节。', '',
   ].join('\n');
   const base = planBase(plan);
   const businessFacts = Object.fromEntries(
@@ -256,30 +167,24 @@ function initialize(inputPath, options = {}) {
     && plan.dataModels.every(model => model.name && list(model.fields).length > 0
       && model.fields.every(field => field?.name && field?.type && typeof field.required === 'boolean'));
   const businessPart = `${JSON.stringify({ base, ready: businessReady, facts: businessFacts }, null, 2)}\n`;
-  // Reuse the selected theme; page-specific design remains required for custom pages.
+  // The intake already records an atomic visual selection. Seed it here so a
+  // standard first Plan only needs one model planning pass for business facts.
   const selectedVisual = plan.visualStyle.forUser;
   const visualReady = /^#[0-9a-f]{6}$/i.test(selectedVisual.colorStrategy.primaryColor || '')
     && ['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[')
-      || issue.path.startsWith('visualStyle.creativeDirection.') || issue.path.startsWith('visualStyle.tokens.'));
+    && ['label', 'description'].every(key => typeof selectedVisual.visualDirection[key] === 'string' && selectedVisual.visualDirection[key].trim());
   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');
-  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]]);
+  writeFiles([[output, `${JSON.stringify(plan, null, 2)}\n`], [guide, context], [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',
-      command: materializeCommand },
+      command: `openyida design-plan materialize ${output} --business-file ${business} --visual-file ${visual} --json` },
     parallelTasks: [...(!businessReady ? [{ id: 'business', skill: 'yida-prd', output: business, dependsOn: [] }] : []),
-      ...(!visualReady ? [{ id: 'visual-design', skill: 'yida-design', output: visual, dependsOn: !businessReady && pages.length ? ['business'] : [] }] : [])],
+      ...(!visualReady ? [{ id: 'visual-selection', skill: 'yida-design', output: visual, dependsOn: [] }] : [])],
     preparedInputs: { business, businessReady, visual, visualReady },
-    authoring: { pendingFields: authoring.pendingFields, completion: authoring.completion, visualDecision: authoring.visualDecision },
     optionalTasks: [{ id: 'visual-refinement', skill: 'yida-design', input: business, output: visual, dependsOn: ['business'],
       when: 'brand material, reference images, or explicit page-specific visual differences require refinement' }],
   };
 }
 
-module.exports = { initialize, catalog };
+module.exports = { initialize };