openyida 2026.9.21 → 2026.9.22-beta.1

package/lib/app/custom-theme.js

@@ -3,9 +3,6 @@
 const fs = require('fs');
 const path = require('path');
 const { getAccessToken } = require('../auth/token-auth');
-const { CliError } = require('../core/cli-error');
-const { t } = require('../core/i18n');
-const { findCssStructureIssue } = require('../core/css-structure');
 
 const MAX_THEME_FILE_BYTES = 20 * 1024 * 1024;
 const REQUIRED_BRAND_SCALE_TOKENS = Object.freeze([
@@ -150,14 +147,6 @@ function extractThemeColor(cssText) {
 
 function validateThemeCssContent(cssText) {
   const source = String(cssText || '');
-  // Check the original text before stripping comments or rewriting token scopes.
-  const issue = findCssStructureIssue(source);
-  if (issue) {
-    const line = source.slice(0, issue.index).split('\n').length;
-    throw new CliError(t('design_document.theme_css_invalid', line), {
-      code: 'THEME_CSS_STRUCTURE_INVALID', details: { line, ...issue },
-    });
-  }
   const sourceWithoutComments = source.replace(/\/\*[\s\S]*?\*\//g, '');
   for (const rule of UNSAFE_THEME_PATTERNS) {
     if (rule.pattern.test(sourceWithoutComments)) {

package/lib/app/form-field-validator.js

@@ -1,19 +1,5 @@
 'use strict';
 
-const { t } = require('../core/i18n');
-
-// vc-deep-yida: components/vs-divider-style + components/yida-divider.
-// 这里只定义平台能力，不按业务场景排序；样式由页面设计选择。
-const DIVIDER_TYPES = Object.freeze([
-  'solid', 'dashed', 'thick', 'dotted', 'bold-with-thin',
-  'solid-center', 'solid-left', 'left-dot-title', 'light-left-bar',
-  'light-bar', 'dark-bar', 'light-left-title', 'light-center-title',
-  'light-house-title', 'light-hexagon-title', 'hexagon-title', 'badge-line',
-  'multi-parallelograms-end', 'center-title-with-bar', 'double-color-trapezoid',
-  'arrow-right-title', 'square-blocks-title', 'inner-ellipse-title',
-]);
-const DEFAULT_DIVIDER_TYPE = 'bold-with-thin';
-
 const FIELD_TYPE_ALIAS = Object.freeze({
   TextAreaField: 'TextareaField',
   Textareafield: 'TextareaField',
@@ -58,6 +44,10 @@ const PRESENTATION_TYPE_ALIAS = Object.freeze({
   columnContainer: 'ColumnContainer',
   Column: 'Column',
   column: 'Column',
+  GroupContainer: 'GroupContainer',
+  groupContainer: 'GroupContainer',
+  PageSection: 'PageSection',
+  pageSection: 'PageSection',
 });
 
 const BUSINESS_FIELD_TYPES = Object.freeze([
@@ -86,6 +76,8 @@ const PRESENTATION_FIELD_TYPES = Object.freeze([
   'Divider',
   'ColumnContainer',
   'Column',
+  'GroupContainer',
+  'PageSection',
 ]);
 
 const OPTION_FIELD_TYPES = Object.freeze([
@@ -240,19 +232,14 @@ function validateDivider(field, path, diagnostics) {
       'Use a plain string title or omit title.'
     );
   }
-  const styleInputs = ['dividerType', 'dividerStyle', 'styleType', 'typeStyle']
-    .map(key => [key, field[key]]);
-  styleInputs.push(['props.type', field.props?.type]);
-  for (const [key, value] of styleInputs) {
-    if (value === undefined || value === null || value === '') {continue;}
-    if (typeof value === 'string' && DIVIDER_TYPES.includes(value.trim())) {continue;}
+  if (field.dividerType !== undefined && typeof field.dividerType !== 'string') {
     pushDiagnostic(
       diagnostics,
       'INVALID_DIVIDER_TYPE',
-      path + '.' + key,
-      DIVIDER_TYPES.join(' | '),
-      typeof value === 'string' ? value : describeActual(value),
-      t('create_form.divider_type_invalid', String(value), DIVIDER_TYPES.join(', ')),
+      path + '.dividerType',
+      'string',
+      describeActual(field.dividerType),
+      'Divider.dividerType must be a string when provided.',
       'Use a supported divider style string or omit dividerType.'
     );
   }
@@ -366,6 +353,11 @@ function validateFieldDefinition(field, path, diagnostics, options) {
     return;
   }
 
+  if (type === 'GroupContainer' || type === 'PageSection') {
+    validateOneDimensionalChildren(field, path, diagnostics, type);
+    return;
+  }
+
   if (type === 'TableField') {
     validateTableField(field, path, diagnostics);
   }
@@ -485,6 +477,31 @@ function validateColumnContainer(field, path, diagnostics) {
   });
 }
 
+function validateOneDimensionalChildren(field, path, diagnostics, type) {
+  if (!validateChildrenPropertyShape(field, path, diagnostics, 'FieldDefinition[]')) {
+    return;
+  }
+  if (field.children === undefined || field.children === null) {
+    return;
+  }
+  field.children.forEach(function (child, childIndex) {
+    const childPath = path + '.children[' + childIndex + ']';
+    if (Array.isArray(child)) {
+      pushDiagnostic(
+        diagnostics,
+        'INVALID_' + type.toUpperCase() + '_CHILDREN_DEPTH',
+        childPath,
+        'FieldDefinition object',
+        'array',
+        type + '.children must be a one-dimensional field array.',
+        'Remove extra array nesting from ' + type + '.children.'
+      );
+      return;
+    }
+    validateFieldDefinition(child, childPath, diagnostics);
+  });
+}
+
 function validateTableField(field, path, diagnostics) {
   if (!validateChildrenPropertyShape(field, path, diagnostics, 'FieldDefinition[]')) {
     return;
@@ -540,6 +557,4 @@ module.exports = {
   normalizeDefinitionType,
   BUSINESS_FIELD_TYPES,
   PRESENTATION_FIELD_TYPES,
-  DIVIDER_TYPES,
-  DEFAULT_DIVIDER_TYPE,
 };

package/lib/app/form-open-guard.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const Babel = require('@babel/standalone');
-const { t } = require('../core/i18n');
 
 const parser = Babel.packages.parser;
 const traverse = Babel.packages.traverse.default || Babel.packages.traverse;
@@ -78,13 +77,6 @@ function isWindowOpenCall(callee) {
   );
 }
 
-function isLocationCall(callee) {
-  return callee?.type === 'MemberExpression'
-    && ['assign', 'replace'].includes(callee.property?.name)
-    && (callee.object?.name === 'location'
-      || (callee.object?.object?.name === 'window' && callee.object?.property?.name === 'location'));
-}
-
 function isOpenPageCall(callee) {
   return !!(
     callee &&
@@ -122,26 +114,18 @@ function isLocationHrefAssignment(node) {
 }
 
 function isMobileGuarded(pathRef, sourceCode) {
-  const mobileCondition = node => {
-    if (node?.type === 'UnaryExpression' && node.operator === '!') {return -mobileCondition(node.argument);}
-    const text = getNodeText(sourceCode, node);
-    if (node?.type === 'Identifier' || node?.type === 'MemberExpression' || node?.type === 'CallExpression') {
-      return MOBILE_GUARD_PATTERN.test(text) && !/min-width/.test(text) ? 1 : 0;
-    }
-    return 0;
-  };
   let cursor = pathRef;
   while (cursor && cursor.parentPath) {
     const parent = cursor.parentPath;
-    if (['IfStatement', 'ConditionalExpression'].includes(parent.node?.type)) {
-      const direction = mobileCondition(parent.node.test);
-      if ((direction === 1 && nodeContains(parent.node.consequent, pathRef.node))
-        || (direction === -1 && nodeContains(parent.node.alternate, pathRef.node))) {return true;}
+    if (parent.node && parent.node.type === 'IfStatement' && nodeContains(parent.node.consequent, pathRef.node)) {
+      if (MOBILE_GUARD_PATTERN.test(getNodeText(sourceCode, parent.node.test))) {
+        return true;
+      }
     }
-    if (parent.node?.type === 'LogicalExpression' && nodeContains(parent.node.right, pathRef.node)) {
-      const direction = mobileCondition(parent.node.left);
-      if ((parent.node.operator === '&&' && direction === 1)
-        || (parent.node.operator === '||' && direction === -1)) {return true;}
+    if (parent.node && parent.node.type === 'ConditionalExpression') {
+      if (MOBILE_GUARD_PATTERN.test(getNodeText(sourceCode, parent.node.test))) {
+        return true;
+      }
     }
     cursor = parent;
   }
@@ -177,17 +161,9 @@ function findDirectFormOpenIssues(sourceCode, options = {}) {
   }
 
   const knownFormUrlNames = new Set();
-  const containerNames = new Set(['formOpenContainer']);
   traverse(ast, {
     VariableDeclarator(pathRef) {
       const id = pathRef.node.id;
-      if (id?.type === 'ObjectPattern' && pathRef.node.init?.callee?.name === 'useYidaFormOpen') {
-        for (const property of id.properties) {
-          if (property.key?.name === 'formOpenContainer' && property.value?.type === 'Identifier') {
-            containerNames.add(property.value.name);
-          }
-        }
-      }
       if (!id || id.type !== 'Identifier') {
         return;
       }
@@ -198,30 +174,10 @@ function findDirectFormOpenIssues(sourceCode, options = {}) {
   });
 
   const issues = [];
-  const templateParts = new Map();
-  const templateUses = [];
-  let containerRendered = false;
-  const functionName = pathRef => {
-    const owner = pathRef.getFunctionParent();
-    return owner?.node.id?.name || owner?.parentPath?.node.id?.name;
-  };
-  const addTemplatePart = (owner, part) => {
-    if (!templateParts.has(owner)) {templateParts.set(owner, new Set());}
-    templateParts.get(owner).add(part);
-  };
   traverse(ast, {
     CallExpression(pathRef) {
       const callee = pathRef.node.callee;
-      if (callee.type === 'Identifier' && callee.name === 'useYidaFormOpen') {
-        templateUses.push(pathRef.node);
-      }
-      if (callee.type === 'Identifier' && ['openForm', 'setFormRequest'].includes(callee.name)
-        && pathRef.node.arguments[0]?.type === 'ObjectExpression'
-        && pathRef.node.arguments[0].properties.some(property => (property.key?.name || property.key?.value) === 'type'
-          && ['submission', 'detail'].includes(property.value?.value))) {
-        templateUses.push(pathRef.node);
-      }
-      if (!isWindowOpenCall(callee) && !isOpenPageCall(callee) && !isLocationCall(callee)) {
+      if (!isWindowOpenCall(callee) && !isOpenPageCall(callee)) {
         return;
       }
       const firstArg = pathRef.node.arguments && pathRef.node.arguments[0];
@@ -251,56 +207,13 @@ function findDirectFormOpenIssues(sourceCode, options = {}) {
         callee: getNodeText(sourceCode, pathRef.node.left),
       });
     },
-    JSXExpressionContainer(pathRef) {
-      if ((pathRef.parentPath.isJSXElement() || pathRef.parentPath.isJSXFragment())
-        && containerNames.has(pathRef.node.expression?.name)) {
-        containerRendered = true;
-      }
-    },
-    JSXOpeningElement(pathRef) {
-      const name = pathRef.node.name?.name;
-      const owner = functionName(pathRef);
-      addTemplatePart(owner, name);
-      if (name === 'FormOpenContainer' && owner !== 'useYidaFormOpen') {
-        templateUses.push(pathRef.node);
-        containerRendered = true;
-      }
-      const attribute = key => pathRef.node.attributes.find(item => item.type === 'JSXAttribute' && item.name?.name === key)?.value;
-      const value = node => node?.type === 'JSXExpressionContainer' ? node.expression : node;
-      if (owner === 'CanvasDrawer' && attribute('className')?.value === 'oy-drawer-resize'
-        && attribute('onPointerDown') && attribute('onPointerMove') && attribute('onPointerUp') && attribute('onKeyDown')) {
-        addTemplatePart(owner, 'resize-handle');
-      }
-      if (name === 'a' && expressionLooksLikeFormUrl(value(attribute('href')), sourceCode, knownFormUrlNames)) {
-        issues.push({ line: getNodeLine(pathRef.node), callee: 'a[href]' });
-      }
-      if (!['iframe', 'YidaCanvasIframe'].includes(name) || owner === 'FormOpenContainer') {return;}
-      if (!expressionLooksLikeFormUrl(value(attribute('src')), sourceCode, knownFormUrlNames)) {return;}
-      // 导航主内容可以嵌原生页；弹层内的表单必须使用提供的容器。
-      const overlay = pathRef.findParent(parent => parent.isJSXElement() && (
-        ['Drawer', 'Modal', 'CanvasDrawer'].includes(parent.node.openingElement.name?.name)
-        || parent.node.openingElement.attributes.some(item => item.type === 'JSXAttribute'
-          && ((item.name?.name === 'role' && item.value?.value === 'dialog')
-            || (item.name?.name === 'style' && /position\s*:\s*['"]fixed['"]/.test(getNodeText(sourceCode, item.value)))))));
-      if (overlay) {issues.push({ line: getNodeLine(pathRef.node), callee: `${name} outside FormOpenContainer` });}
-    },
   });
 
-  if (templateUses.length) {
-    const hasParts = (owner, parts) => parts.every(part => templateParts.get(owner)?.has(part));
-    const complete = hasParts('FormOpenContainer', ['CanvasDrawer', 'iframe'])
-      && hasParts('CanvasDrawer', ['Drawer', 'ExternalLink', 'Maximize2', 'Minimize2', 'X', 'resize-handle'])
-      && hasParts('useYidaFormOpen', ['FormOpenContainer']) && containerRendered;
-    if (!complete) {
-      issues.push({ line: getNodeLine(templateUses[0]), callee: 'incomplete FormOpenContainer template' });
-    }
-  }
-
   return issues;
 }
 
 function formatDirectFormOpenMessage() {
-  return t('publish.lint_form_open_container');
+  return '自定义页内打开表单提交/详情只能使用 FormOpenContainer：PC 端用 50vw 抽屉 iframe，移动端才整页或新页打开。按钮事件请调用 openForm({ type: "submission" | "detail", ... })。';
 }
 
 module.exports = {

package/lib/app/get-form-config.js

@@ -24,7 +24,6 @@ const { throwCommandError } = require('../core/command-errors');
 
 // 常用配置字段白名单（人读摘要），--json 会输出完整对象
 const SUMMARY_FIELDS = [
-  'renderNav',
   'isRenderNav',
   'submissionRule',
   'defaultOrder',

package/lib/app/inline-css-guard.js

@@ -4,7 +4,37 @@ const Babel = require('@babel/standalone');
 const { CliError } = require('../core/cli-error');
 const { t } = require('../core/i18n');
 
-const { findCssStructureIssue } = require('../core/css-structure');
+// 检查 CSS 的结构闭合，避免一个未闭合 var() 吞掉后续规则。
+// 不执行页面代码，也不把动态插值当成完整 CSS 进行猜测性校验。
+function findCssStructureIssue(css) {
+  const stack = [];
+  const pairs = { '(': ')', '[': ']', '{': '}' };
+  for (let index = 0; index < css.length; index++) {
+    const char = css[index];
+    if (char === '\\') { index++; continue; }
+    if (char === '/' && css[index + 1] === '*') {
+      const end = css.indexOf('*/', index + 2);
+      if (end < 0) { return { index, type: 'unclosed_comment' }; }
+      index = end + 1;
+    } else if (char === '"' || char === "'") {
+      const start = index;
+      for (index++; index < css.length; index++) {
+        if (css[index] === '\\') { index++; continue; }
+        if (css[index] === char) { break; }
+      }
+      if (index >= css.length) { return { index: start, type: 'unclosed_string' }; }
+    } else if (pairs[char]) {
+      stack.push({ char, index });
+    } else if (')]}'.includes(char)) {
+      const open = stack.pop();
+      if (!open || pairs[open.char] !== char) {
+        return { index: open ? open.index : index, type: 'mismatched_delimiter', expected: open && pairs[open.char], actual: char };
+      }
+    }
+  }
+  const open = stack.pop();
+  return open ? { index: open.index, type: 'unclosed_delimiter', expected: pairs[open.char] } : null;
+}
 
 function resolveStaticCss(pathRef, seen = new Set()) {
   if (pathRef.isStringLiteral()) { return { text: pathRef.node.value, node: pathRef.node }; }

package/lib/app/services/form-compiler.js

@@ -1615,7 +1615,7 @@ function buildFormSchema(formTitle, fields, formUuid, corpId, appType, layout, t
       id: nextNodeId(),
       props: {
         contentBgColor: 'white',
-        pageStyle: { backgroundColor: 'transparent' },
+        pageStyle: { backgroundColor: '#f2f3f5' },
         contentMargin: '20',
         contentPadding: '20',
         showTitle: false,
@@ -1638,6 +1638,7 @@ function buildFormSchema(formTitle, fields, formUuid, corpId, appType, layout, t
         labelWeightMobile: 'normal',
       },
       condition: true,
+      css: 'body{background-color:#f2f3f5}',
       methods: {
         __initMethods__: {
           type: 'js',
@@ -1832,7 +1833,7 @@ function buildEmptyFormSchema() {
           id: nextNodeId(),
           props: {
             contentBgColor: 'white',
-            pageStyle: { backgroundColor: 'transparent' },
+            pageStyle: { backgroundColor: '#f2f3f5' },
             contentMargin: '20',
             contentPadding: '20',
             showTitle: false,
@@ -1843,6 +1844,7 @@ function buildEmptyFormSchema() {
             contentBgColorMobile: 'white',
           },
           condition: true,
+          css: 'body{background-color:#f2f3f5}',
           methods: {
             __initMethods__: {
               type: 'js',

package/lib/app/theme-from-design.js

@@ -1,33 +1,42 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
 const { CliError } = require('../core/cli-error');
 const { REQUIRED_BRAND_SCALE_TOKENS, validateThemeCssContent, extractThemeColor } = require('./custom-theme');
-const { parseDesignDocument, extractDesignTokens } = require('../design/document');
-const NAVIGATION_COLOR_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',
-];
-const DECLARATIONS = /^[ \t]*(--[\w-]+)\s*:\s*([^;]+);/gm;
 
-function designMetadata(markdown) {
-  const frontmatter = /^\uFEFF?---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/.exec(markdown);
+// Both flat Fast tokens and grouped Plan tokens use one scalar declaration per line.
+function readDesignTokens(markdown) {
+  const frontmatter = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/.exec(markdown);
   if (!frontmatter) {
     throw new CliError('design.md 缺少包含 token 的 frontmatter', { code: 'DESIGN_THEME_TOKENS_REQUIRED' });
   }
-  // Historical Fast files permitted bare HEX values. Versioned documents use
-  // valid YAML; all consumers share the same narrow legacy compatibility path.
-  return parseDesignDocument(markdown, { legacyTokenValues: true }).metadata;
-}
-
-// New Fast and Plan files share grouped tokens. Legacy flat files remain readable.
-function readDesignTokens(markdown) {
-  return tokensFromMetadata(designMetadata(markdown));
-}
-
-function tokensFromMetadata(metadata) {
-  const tokens = extractDesignTokens(metadata, { strict: false });
+  const tokens = {};
+  for (const line of frontmatter[1].split(/\r?\n/)) {
+    const match = /^\s*["']?(--[\w-]+)["']?\s*:\s*(.+?)\s*$/.exec(line);
+    if (!match) {continue;}
+    const name = match[1];
+    // YAML comments may follow a quoted value; # inside a color or string is data.
+    const scalar = /^("(?:[^"\\]|\\.)*"|'(?:[^']|'')*'|.*?)\s*(?:\s+#.*)?$/.exec(match[2]);
+    const raw = scalar[1].trim();
+    let value = raw;
+    if (raw.startsWith('"')) {
+      try { value = JSON.parse(raw); } catch {
+        throw new CliError(`token ${name} 必须是单行字符串`, { code: 'DESIGN_THEME_TOKEN_INVALID' });
+      }
+    } else if (raw.startsWith("'")) {
+      if (!raw.endsWith("'")) {throw new CliError(`token ${name} 引号不完整`, { code: 'DESIGN_THEME_TOKEN_INVALID' });}
+      value = raw.slice(1, -1).replace(/''/g, "'");
+    }
+    if (typeof value !== 'string' || !value.trim() || /[;{}\r\n<>]|\/\*|\*\//.test(value) || /^[|>]/.test(value)) {
+      throw new CliError(`token ${name} 必须是已确定的单行 CSS 值`, { code: 'DESIGN_THEME_TOKEN_INVALID' });
+    }
+    if (name in tokens && tokens[name] !== value) {
+      throw new CliError(`token ${name} 存在冲突值`, { code: 'DESIGN_THEME_TOKEN_CONFLICT' });
+    }
+    if (/^--color-brand1-(4|7|8)$/.test(name)) {
+      throw new CliError(`平台不支持 ${name}`, { code: 'DESIGN_THEME_TOKEN_INVALID' });
+    }
+    tokens[name] = value;
+  }
   const missing = REQUIRED_BRAND_SCALE_TOKENS.filter(name => !tokens[name]);
   if (missing.length) {
     throw new CliError(`design.md 缺少品牌 token：${missing.join(', ')}`, { code: 'DESIGN_THEME_TOKENS_REQUIRED' });
@@ -35,8 +44,8 @@ function tokensFromMetadata(metadata) {
   return tokens;
 }
 
-function resolveDesignTokens(metadata) {
-  const tokens = tokensFromMetadata(metadata);
+function resolveDesignTokens(markdown) {
+  const tokens = readDesignTokens(markdown);
   for (const [alias, source] of Object.entries({
     '--color-brand-1': '--color-brand1-10', '--color-brand-2': '--color-brand1-1',
     '--color-brand-3': '--color-brand1-6', '--color-brand-4': '--color-brand1-9',
@@ -47,118 +56,14 @@ function resolveDesignTokens(metadata) {
   return tokens;
 }
 
-function navigationTone(metadata, tokens) {
-  if (!NAVIGATION_COLOR_TOKENS.every(name => tokens[name])) {return null;}
-  const tone = metadata.themeProfile?.navTheme;
-  if (['light', 'dark'].includes(tone)) {return tone;}
-  if (tone !== undefined) {throw new CliError('themeProfile.navTheme 必须是 light 或 dark', { code: 'DESIGN_THEME_NAVIGATION_INVALID' });}
-  const seen = new Set();
-  let value = tokens['--pod-shell-theme-bg-color'];
-  while (/^var\(/.test(value || '')) {
-    const alias = /^var\((--[\w-]+)(?:,\s*([^)]+))?\)$/.exec(value);
-    if (!alias || seen.has(alias[1])) {return null;}
-    seen.add(alias[1]);
-    value = tokens[alias[1]] || alias[2];
-  }
-  let rgb;
-  if (/^#[\da-f]{3}$/i.test(value || '')) {value = `#${[...value.slice(1)].map(char => char + char).join('')}`;}
-  if (/^#[\da-f]{6}$/i.test(value || '')) {rgb = [1, 3, 5].map(index => parseInt(value.slice(index, index + 2), 16));}
-  const functional = /^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/.exec(value || '');
-  if (functional) {rgb = functional.slice(1, 4).map(Number);}
-  return rgb ? (rgb[0] * 0.2126 + rgb[1] * 0.7152 + rgb[2] * 0.0722 < 128 ? 'dark' : 'light') : null;
-}
-
-function declarationValues(body) {
-  return Object.fromEntries([...body.matchAll(DECLARATIONS)].map(match => [match[1], match[2].trim()]));
-}
-
-function replaceDeclarations(body, values, addMissing = false) {
-  const existing = new Set();
-  let result = body.replace(DECLARATIONS, (line, name, value) => {
-    existing.add(name);
-    return name in values ? line.replace(value, () => values[name]) : line;
-  });
-  if (addMissing) {
-    result += Object.entries(values).filter(([name]) => !existing.has(name))
-      .map(([name, value]) => `  ${name}: ${value};\n`).join('');
-  }
-  return result;
-}
-
-function applyNavigationTokens(css, tokens, changed, tone, previousTone) {
-  // The public stylesheet has a second :root and explicit mode overrides. Read
-  // their defaults so applying a dark project cannot leak white text into light modes.
-  const source = fs.readFileSync(path.resolve(__dirname,
-    '../../yida-skills/skills/yida-design/references/theme/app-custom-theme-template.css'), 'utf8');
-  const defaults = Object.assign({}, ...[...source.matchAll(/^:root\s*\{([^}]+)\}/gm)].map(match => declarationValues(match[1])));
-  const isNavigation = name => /^(--pod-nav-|--pod-shell-|--pod-page-header-)/.test(name);
-  const navigationNames = Object.keys(tokens).filter(isNavigation);
-  const navigationChanged = Object.fromEntries(navigationNames.filter(name => name in changed).map(name => [name, tokens[name]]));
-  let output = css.replace(/(^:root\s*\{)([^}]+)(\})/gm,
-    (block, start, body, close) => start + replaceDeclarations(body, navigationChanged) + close);
-  for (const mode of ['light', 'dark']) {
-    const modeDefaults = { ...defaults };
-    for (const selector of [`nav-${mode}`, `is-${mode}`]) {
-      Object.assign(modeDefaults, declarationValues(source.match(new RegExp(`\\.pod-premium\\.${selector}\\s*\\{([^}]+)\\}`))?.[1] || ''));
-    }
-    // A first application or a mode change establishes both palettes. Delta
-    // updates otherwise leave unrelated, manually customized declarations alone.
-    const resetMode = !previousTone || previousTone !== tone;
-    // The selected marker is a mode-independent shape, not a navigation palette.
-    const names = (resetMode ? navigationNames : (mode === tone ? Object.keys(navigationChanged) : []))
-      .filter(name => name !== '--pod-nav-menu-item-selected-shadow');
-    const values = Object.fromEntries(names.map(name => [name, mode === tone ? tokens[name] : modeDefaults[name]])
-      .filter(([, value]) => value !== undefined));
-    if (!Object.keys(values).length) {continue;}
-    const isForeground = name => name.startsWith('--pod-nav-') || name === '--pod-page-header-text-color';
-    const background = Object.fromEntries(Object.entries(values).filter(([name]) => !isForeground(name)));
-    const shell = values['--pod-shell-theme-bg-color'];
-    if (shell && !tokens['--pod-page-header-bg-color']) {
-      background['--pod-page-header-bg-color'] = mode === tone ? shell : modeDefaults['--pod-page-header-bg-color'];
-    }
-    if (Object.keys(background).length) {
-      output = output.replace(new RegExp(`(\\.pod-premium\\.nav-${mode}\\s*\\{)([^}]*)(\\})`, 'g'),
-        (block, start, body, close) => start + replaceDeclarations(body, background, true) + close);
-    }
-    const foregrounds = Object.fromEntries(Object.entries(values).filter(([name]) => isForeground(name)));
-    output = output.replace(new RegExp(`(\\.pod-premium\\.is-${mode}\\s*\\{)([^}]*)(\\})`, 'g'),
-      (block, start, body, close) => start + replaceDeclarations(body, foregrounds, true) + close);
-  }
-  return output;
-}
-
 function applyDesignTokens(template, markdown, previousMarkdown) {
-  const metadata = designMetadata(markdown);
-  const previousMetadata = previousMarkdown === markdown ? metadata : (previousMarkdown ? designMetadata(previousMarkdown) : null);
-  const tokens = resolveDesignTokens(metadata);
-  // Bundled CSS is an authoring template. Fill only unresolved declarations from
-  // the completed design before validating and rewriting CSS scopes.
-  template = template.replace(/^([ \t]*)(--[\w-]+)(\s*:\s*)([^;\n]+);/gm,
-    (line, indent, name, separator, value) => {
-      if (!/\{\{PRIMARY_COLOR\}\}|<生成实际色值：/.test(value)) {return line;}
-      if (!tokens[name] || /\{\{|<生成实际色值：/.test(tokens[name])) {
-        throw new CliError(`design.md 缺少品牌 token：${name}`, { code: 'DESIGN_THEME_TOKENS_REQUIRED' });
-      }
-      return `${indent}${name}${separator}${tokens[name]};`;
-    });
-  // Reject damaged templates or existing stylesheets before the scope rewrite.
-  validateThemeCssContent(template);
-  // Older generated files have the selected-shadow rule only. Bring in the
-  // shared consumer once when a design opts into menu borders, retaining all
-  // existing project rules and declarations during incremental updates.
-  if (tokens['--pod-nav-menu-item-border'] && !template.includes('border: var(--pod-nav-menu-item-border,')) {
-    const source = fs.readFileSync(path.resolve(__dirname,
-      '../../yida-skills/skills/yida-design/references/theme/app-custom-theme-template.css'), 'utf8');
-    const shapeRules = source.match(/\/\* openyida-navigation-shape:start \*\/[\s\S]*?\/\* openyida-navigation-shape:end \*\//)[0];
-    template += `\n${shapeRules}\n`;
-  }
-  const previous = previousMetadata === metadata ? tokens : (previousMetadata ? resolveDesignTokens(previousMetadata) : null);
-  const tone = navigationTone(metadata, tokens);
-  const previousTone = previous ? navigationTone(previousMetadata, previous) : null;
+  const tokens = resolveDesignTokens(markdown);
+  const previous = previousMarkdown ? resolveDesignTokens(previousMarkdown) : null;
   const changed = Object.fromEntries(Object.entries(tokens).filter(([name, value]) => !previous || previous[name] !== value));
-  if (!Object.keys(changed).length && tone === previousTone) {
+  if (!Object.keys(changed).length) {
+    validateThemeCssContent(template);
     extractThemeColor(template);
-    return require('./application-style').applyApplicationStyle(template, metadata, tokens);
+    return template;
   }
   const root = /^:root\s*\{([\s\S]*?)^\}/m.exec(template);
   if (!root) {throw new Error('应用主题模板缺少 :root');}
@@ -171,18 +76,10 @@ function applyDesignTokens(template, markdown, previousMarkdown) {
   let body = root[1].replace(declarations, (line, name, value) => line.replace(value, () => changed[name] || replaceBrand(value)));
   const extra = Object.entries(changed).filter(([name]) => !(name in original));
   body += extra.map(([name, value]) => `  ${name}: ${value};\n`).join('');
-  let tail = template.slice(root.index + root[0].length).replace(declarations,
+  // Keep scoped nav/light/dark selectors and their variable relationships intact.
+  const tail = template.slice(root.index + root[0].length).replace(declarations,
     (line, name, value) => line.replace(value, () => replaceBrand(value)));
-  // Platform navigation modes bind independently; the root shell remains the custom-page default.
-  if (!tone && changed['--pod-shell-theme-bg-color']) {
-    tail = tail.replace(/(\.pod-premium\.nav-(light|dark)\s*\{)([^}]*)(\})/g,
-      (block, selector, tone, body, close) => selector + body.replace(declarations,
-        (line, name, value) => ['--pod-shell-theme-bg-color', '--pod-page-header-bg-color'].includes(name)
-          ? line.replace(value, `var(--color-brand1-${tone === 'dark' ? 5 : 3})`) : line) + close);
-  }
-  let css = `${template.slice(0, root.index)}:root {${body}}${tail}`;
-  if (tone) {css = applyNavigationTokens(css, tokens, changed, tone, previousTone);}
-  css = require('./application-style').applyApplicationStyle(css, metadata, tokens);
+  const css = `${template.slice(0, root.index)}:root {${body}}${tail}`;
   validateThemeCssContent(css);
   extractThemeColor(css);
   return css;

package/lib/app/theme-presets.js

@@ -122,7 +122,7 @@ function assertPresetThemeKey(themeKey) {
   throw new Error(
     `Unsupported theme: ${themeKey}. Use one of: ${formatPresetThemeKeys()}. ` +
     'For custom colors or application theme token profiles that are not platform --theme keys, ' +
-    'upload an application theme CSS file with update-app --theme-file.'
+    'upload an application theme CSS file with update-app --theme-file and pass --theme-color instead.'
   );
 }