openyida 2026.9.3 → 2026.9.4

package/lib/app/page-linter.js

@@ -15,6 +15,7 @@ const THEN_CALLBACK_LINE_LIMIT = 50;
 const CALLBACK_SCAN_LINE_LIMIT = 80;
 const parser = Babel.packages.parser;
 const traverse = Babel.packages.traverse.default || Babel.packages.traverse;
+const FORBIDDEN_SEARCH_FORM_DYNAMIC_ORDER_FIELDS = new Set(['gmtCreate']);
 
 const PARSER_OPTIONS = {
   sourceType: 'module',
@@ -404,6 +405,142 @@ function getNodeLine(node) {
   return node && node.loc && node.loc.start && node.loc.start.line ? node.loc.start.line : 1;
 }
 
+function getStaticPropertyName(property) {
+  if (!property || (property.type !== 'ObjectProperty' && property.type !== 'ObjectMethod')) {
+    return '';
+  }
+  const key = property.key;
+  if (!key) {
+    return '';
+  }
+  if (key.type === 'Identifier' && !property.computed) {
+    return key.name;
+  }
+  if (key.type === 'StringLiteral') {
+    return key.value;
+  }
+  return '';
+}
+
+function getMemberPropertyName(member) {
+  if (!member || (member.type !== 'MemberExpression' && member.type !== 'OptionalMemberExpression') || !member.property) {
+    return '';
+  }
+  if (member.property.type === 'Identifier' && !member.computed) {
+    return member.property.name;
+  }
+  if (member.property.type === 'StringLiteral') {
+    return member.property.value;
+  }
+  return '';
+}
+
+function getStaticStringValue(node) {
+  if (!node) {
+    return null;
+  }
+  if (node.type === 'StringLiteral') {
+    return node.value;
+  }
+  if (node.type === 'TemplateLiteral' && node.expressions.length === 0) {
+    return node.quasis.map(part => part.value.cooked || '').join('');
+  }
+  return null;
+}
+
+function unwrapJsonStringify(node) {
+  if (!node || node.type !== 'CallExpression' || !node.callee || node.callee.type !== 'MemberExpression') {
+    return node;
+  }
+  const object = node.callee.object;
+  if (object && object.type === 'Identifier' && object.name === 'JSON' && getMemberPropertyName(node.callee) === 'stringify') {
+    return node.arguments && node.arguments[0] ? node.arguments[0] : node;
+  }
+  return node;
+}
+
+function resolveStaticBinding(node, pathRef) {
+  if (!node || node.type !== 'Identifier' || !pathRef || !pathRef.scope) {
+    return node;
+  }
+  const binding = pathRef.scope.getBinding(node.name);
+  if (!binding || !binding.constant || !binding.path || binding.path.node.type !== 'VariableDeclarator') {
+    return node;
+  }
+  return binding.path.node.init || node;
+}
+
+function findForbiddenDynamicOrderFields(node, pathRef) {
+  const resolved = resolveStaticBinding(node, pathRef);
+  const value = resolveStaticBinding(unwrapJsonStringify(resolved), pathRef);
+  if (value && value.type === 'ObjectExpression') {
+    return value.properties
+      .map(getStaticPropertyName)
+      .filter(field => FORBIDDEN_SEARCH_FORM_DYNAMIC_ORDER_FIELDS.has(field));
+  }
+
+  const staticValue = getStaticStringValue(value);
+  if (staticValue === null) {
+    return [];
+  }
+  try {
+    const parsed = JSON.parse(staticValue);
+    if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') {
+      return [];
+    }
+    return Object.keys(parsed).filter(field => FORBIDDEN_SEARCH_FORM_DYNAMIC_ORDER_FIELDS.has(field));
+  } catch {
+    return [];
+  }
+}
+
+function findDynamicOrderProperty(params) {
+  if (!params || params.type !== 'ObjectExpression') {
+    return null;
+  }
+  return params.properties.find(property => getStaticPropertyName(property) === 'dynamicOrder') || null;
+}
+
+function reportForbiddenDynamicOrderValue(pathRef, value, issueNode, errors, disableMap) {
+  const forbiddenFields = findForbiddenDynamicOrderFields(value, pathRef);
+  if (forbiddenFields.length === 0) {
+    return;
+  }
+  pushIssue(
+    errors,
+    getNodeLine(issueNode),
+    'searchformdata-dynamic-order-metadata',
+    t('publish.lint_searchformdata_dynamic_order_metadata', forbiddenFields.join(', ')),
+    disableMap
+  );
+}
+
+function reportForbiddenDynamicOrder(pathRef, params, errors, disableMap) {
+  const resolvedParams = resolveStaticBinding(params, pathRef);
+  const dynamicOrderProperty = findDynamicOrderProperty(resolvedParams);
+  if (!dynamicOrderProperty) {
+    return;
+  }
+  reportForbiddenDynamicOrderValue(
+    pathRef,
+    dynamicOrderProperty.value,
+    dynamicOrderProperty,
+    errors,
+    disableMap
+  );
+}
+
+function isUrlSearchParamsInstance(node, pathRef) {
+  const resolved = resolveStaticBinding(node, pathRef);
+  return !!(
+    resolved &&
+    resolved.type === 'NewExpression' &&
+    resolved.callee &&
+    resolved.callee.type === 'Identifier' &&
+    resolved.callee.name === 'URLSearchParams'
+  );
+}
+
 function getJsxElementName(nameNode) {
   if (!nameNode) {
     return '';
@@ -633,6 +770,24 @@ function collectAstLintIssues(sourceCode, errors, warnings, disableMap) {
     },
     CallExpression(pathRef) {
       const callee = pathRef.node.callee;
+      if (getMemberPropertyName(callee) === 'searchFormDatas') {
+        const params = pathRef.node.arguments && pathRef.node.arguments[0];
+        reportForbiddenDynamicOrder(pathRef, params, errors, disableMap);
+      }
+
+      const urlSearchParamsMethod = getMemberPropertyName(callee);
+      if (
+        (urlSearchParamsMethod === 'append' || urlSearchParamsMethod === 'set') &&
+        callee &&
+        callee.type === 'MemberExpression' &&
+        isUrlSearchParamsInstance(callee.object, pathRef)
+      ) {
+        const args = pathRef.node.arguments || [];
+        if (getStaticStringValue(args[0]) === 'dynamicOrder') {
+          reportForbiddenDynamicOrderValue(pathRef, args[1], pathRef.node, errors, disableMap);
+        }
+      }
+
       const isSetState = callee &&
         callee.type === 'MemberExpression' &&
         (callee.object.type === 'ThisExpression' ||
@@ -670,6 +825,13 @@ function collectAstLintIssues(sourceCode, errors, warnings, disableMap) {
         pushIssue(warnings, getNodeLine(pathRef.node), 'setState-non-timestamp', t('publish.lint_setstate_non_timestamp'), disableMap);
       }
     },
+    NewExpression(pathRef) {
+      const callee = pathRef.node.callee;
+      if (callee && callee.type === 'Identifier' && callee.name === 'URLSearchParams') {
+        const params = pathRef.node.arguments && pathRef.node.arguments[0];
+        reportForbiddenDynamicOrder(pathRef, params, errors, disableMap);
+      }
+    },
     FunctionDeclaration(pathRef) {
       const id = pathRef.node.id;
       if (!id || id.name !== 'renderJsx') {

package/lib/app/services/canvas-page-schema-builder.js

@@ -216,7 +216,13 @@ function openyidaCreateRouterBridge(utils) {
   if (router && typeof router.push === 'function') {
     bridge.availableMethods.push('push');
     bridge.push = function() {
-      return router.push.apply(router, arguments);
+      var args = Array.prototype.slice.call(arguments);
+      // 完整地址使用 URL 模式，避免平台再次拼接应用路由前缀。
+      if (args[3] === undefined && typeof args[0] === 'string' &&
+          /^(https?:[/][/]|[/][/]|[/]APP_[^/?#]+([/?#]|$))/i.test(args[0])) {
+        args[3] = true;
+      }
+      return router.push.apply(router, args);
     };
   } else {
     bridge.push = function() {
@@ -349,8 +355,8 @@ function buildCanvasPageSchemaObject(sourceCode, runtimeCode, importedModules, f
             componentName: 'Page',
             id: nextNodeId(),
             props: {
-              contentBgColor: 'var(--pod-page-bg-color, var(--color-white, #fff))',
-              pageStyle: { backgroundColor: 'var(--pod-page-bg-color, var(--color-white, #fff))' },
+              contentBgColor: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))',
+              pageStyle: { backgroundColor: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))' },
               contentMargin: '0',
               contentPadding: '0',
               showTitle: false,
@@ -358,10 +364,17 @@ function buildCanvasPageSchemaObject(sourceCode, runtimeCode, importedModules, f
               templateVersion: '1.0.0',
               contentMarginMobile: '0',
               className: 'page_' + nextSuffix(),
-              contentBgColorMobile: 'var(--pod-page-bg-color, var(--color-white, #fff))',
+              contentBgColorMobile: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))',
             },
             condition: true,
-            css: '.vc-page-yida-page{--yida-form-content-padding:0;--yida-form-content-margin:0;--yida-layout-padding:0}.vc-deep-container-entry.vc-rootcontent{padding:0!important;margin-top:0!important;margin-right:0!important;margin-bottom:0!important;margin-left:0!important}',
+            css: [
+              '.vc-page-yida-page{--yida-form-content-padding:0;--yida-form-content-margin:0;--yida-layout-padding:0}',
+              '.vc-deep-container-entry.vc-rootcontent{padding:0!important;margin-top:0!important;margin-right:0!important;margin-bottom:0!important;margin-left:0!important}',
+              // 隔离首个子元素的外边距，浮导 margin 不得把整个 Canvas 顶离页面顶部。
+              '.yida-code-canvas{display:flow-root}',
+              // Canvas 整页的纯容器至少撑满当前视口，避免嵌入时高度塌陷而裁掉内容。
+              '.vc-page-yida-pure-container:has(> .yida-code-canvas){min-height:100vh}',
+            ].join(''),
             methods: {
               __initMethods__: {
                 type: 'js',

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

@@ -0,0 +1,88 @@
+'use strict';
+
+const { CliError } = require('../core/cli-error');
+const { REQUIRED_BRAND_SCALE_TOKENS, validateThemeCssContent, extractThemeColor } = require('./custom-theme');
+
+// 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' });
+  }
+  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' });
+  }
+  return tokens;
+}
+
+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',
+  })) {
+    tokens[alias] = tokens[alias] || tokens[source];
+  }
+  tokens['--color-group'] = tokens['--color-group'] || [6, 1, 5, 2, 9, 3].map(n => tokens[`--color-brand1-${n}`]).join(', ');
+  return tokens;
+}
+
+function applyDesignTokens(template, markdown, previousMarkdown) {
+  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) {
+    validateThemeCssContent(template);
+    extractThemeColor(template);
+    return template;
+  }
+  const root = /^:root\s*\{([\s\S]*?)^\}/m.exec(template);
+  if (!root) {throw new Error('应用主题模板缺少 :root');}
+  const declarations = /^[ \t]*(--[\w-]+)\s*:\s*([^;]+);/gm;
+  const original = Object.fromEntries([...root[1].matchAll(declarations)].map(m => [m[1], m[2].trim()]));
+  const brandValues = new Map(REQUIRED_BRAND_SCALE_TOKENS.filter(name => original[name] && changed[name]).map(name => [original[name], tokens[name]]));
+  const escaped = [...brandValues.keys()].map(value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+  const brandPattern = new RegExp(escaped.join('|'), 'g');
+  const replaceBrand = value => brandValues.size ? value.replace(brandPattern, old => brandValues.get(old)) : value;
+  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('');
+  // 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)));
+  const css = `${template.slice(0, root.index)}:root {${body}}${tail}`;
+  validateThemeCssContent(css);
+  extractThemeColor(css);
+  return css;
+}
+
+module.exports = { readDesignTokens, applyDesignTokens };

package/lib/app/theme-presets.js

@@ -126,7 +126,14 @@ function assertPresetThemeKey(themeKey) {
   );
 }
 
+// colour 保存协议只接受平台主题 key；自定义色值另存 themeColor。
+function assertAppThemeKey(themeKey) {
+  if (themeKey === 'custom') { return; }
+  assertPresetThemeKey(themeKey);
+}
+
 module.exports = {
+  assertAppThemeKey,
   SUPPORTED_THEME_KEYS,
   APP_THEME_TOKEN_PRESETS,
   APP_THEME_TOKEN_PRESET_KEYS,

package/lib/app/update-app.js

@@ -16,7 +16,7 @@ const { createAuthRef } = require('../core/yida-client');
 const { t } = require('../core/i18n');
 const { buildYidaI18n } = require('../core/yida-i18n');
 const { throwCommandError, throwUsage } = require('../core/command-errors');
-const { assertPresetThemeKey } = require('./theme-presets');
+const { assertAppThemeKey } = require('./theme-presets');
 const {
   buildCustomThemeStyle,
   normalizeCssColorToHex,
@@ -284,12 +284,19 @@ function buildUpdateAppNamePostData(params, authRef) {
 }
 
 function buildUpdateAppPostData(params, currentApp = {}, authRef) {
+  assertAppThemeKey(params.colour);
+  if (params.colour && params.colour !== 'custom' && (params.themeFile || params.customThemeStyle || params.themeColor)) {
+    throw new Error(t('update_app.theme_preset_conflict'));
+  }
   const appName = params.name || pickText(currentApp.appName, params.appType);
   const description = params.desc || pickText(currentApp.description, appName);
   const icon = resolveAppIcon(params, currentApp);
 
   const currentThemeColor = pickAppField(currentApp, 'themeColor', 'THEME_COLOR');
   const currentCustomThemeStyle = pickAppField(currentApp, 'customThemeStyle', 'CUSTOM_THEME_STYLE');
+  if (params.colour === 'custom' && !params.themeColor && !currentThemeColor) {
+    throw new Error(t('update_app.custom_theme_color_required'));
+  }
   const postDataObj = {
     _csrf_token: authRef.csrfToken,
     _locale_time_zone_offset: '28800000',
@@ -305,7 +312,7 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     iconUrl: icon,
     colour: params.customThemeStyle || params.themeColor
       ? 'custom'
-      : (params.colour || currentApp.colour || (currentApp.config && currentApp.config.COLOUR) || 'deepBlue'),
+      : (params.colour || currentApp.colour || (currentApp.config && currentApp.config.COLOUR) || (currentThemeColor ? 'custom' : 'deepBlue')),
     // updateApp 的报错文案叫 appMode，但实际接受的请求字段是 mode。
     mode: currentApp.mode || (currentApp.config && currentApp.config.APPMODE) || 'normal',
     type: currentApp.type || (currentApp.config && currentApp.config.APPTYPE) || 'single',
@@ -339,18 +346,23 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     sentryMode: currentApp.sentryMode || (currentApp.config && currentApp.config.SENTRY_MODE) || 'y',
   };
 
-  if (params.hideAppNav !== null) {
+  if (params.hideAppNav !== null && params.hideAppNav !== undefined) {
     postDataObj.hideAppNav = params.hideAppNav;
+  } else {
+    const hideAppNav = pickAppField(currentApp, 'hideAppNav', 'HIDE_APP_NAV');
+    if (hideAppNav !== undefined && hideAppNav !== null) {
+      postDataObj.hideAppNav = hideAppNav;
+    }
   }
   if (params.themeColor) {
     postDataObj.themeColor = params.themeColor;
-  } else if (params.colour) {
+  } else if (params.colour && params.colour !== 'custom') {
     postDataObj.themeColor = '';
   } else if (currentThemeColor !== undefined && currentThemeColor !== null) {
     postDataObj.themeColor = currentThemeColor;
   }
 
-  if (params.colour && !params.customThemeStyle) {
+  if (params.colour && params.colour !== 'custom' && !params.customThemeStyle) {
     // 切回平台预置主题时必须清空旧 CSS，避免 CUSTOM_THEME_STYLE 继续覆盖 colour。
     postDataObj.customThemeStyle = '';
   } else {
@@ -382,34 +394,89 @@ async function fetchCurrentApp(appType, authRef) {
   return response.content || {};
 }
 
+function getThemeSettings(app) {
+  const rawStyle = pickAppField(app, 'customThemeStyle', 'CUSTOM_THEME_STYLE');
+  let customThemeStyle = rawStyle || null;
+  if (typeof customThemeStyle === 'string') {
+    try { customThemeStyle = JSON.parse(customThemeStyle); } catch { /* Keep malformed data visible to verification. */ }
+  }
+  return {
+    colour: pickAppField(app, 'colour', 'COLOUR') || '',
+    themeColor: pickAppField(app, 'themeColor', 'THEME_COLOR') || '',
+    customThemeStyle,
+  };
+}
+
+function themeSettingsMatch(expected, actual) {
+  const normalizeColor = (value) => value ? normalizeCssColorToHex(value) || value : '';
+  if (expected.colour !== actual.colour || normalizeColor(expected.themeColor) !== normalizeColor(actual.themeColor)) {
+    return false;
+  }
+  const expectedStyle = expected.customThemeStyle;
+  const actualStyle = actual.customThemeStyle;
+  if (!expectedStyle || !actualStyle || typeof expectedStyle !== 'object' || typeof actualStyle !== 'object') {
+    return expectedStyle === actualStyle;
+  }
+  return ['enabled', 'iframePropagation'].every((key) => Boolean(expectedStyle[key]) === Boolean(actualStyle[key])) &&
+    ['cssUrl', 'cssFileName'].every((key) => (expectedStyle[key] || '') === (actualStyle[key] || ''));
+}
+
+/** updateApp 整包保存；与基础设置页一致，读取最新配置后合并，并核验主题资源。 */
+async function saveAppSettings(params, authRef) {
+  const currentApp = await fetchCurrentApp(params.appType, authRef);
+  const payload = buildUpdateAppPostData(params, currentApp, authRef);
+  const response = await requestWithAutoLogin((auth) => httpPost(
+    auth.baseUrl,
+    `/${params.appType}/query/app/updateApp.json?_api=Form.updateApp&_mock=false&_stamp=${Date.now()}`,
+    querystring.stringify({ ...payload, _csrf_token: auth.csrfToken })
+  ), authRef);
+  if (!response || !response.success) { return response; }
+
+  const expected = getThemeSettings(payload);
+  if (!params.colour && !params.themeColor && !params.customThemeStyle && !expected.themeColor && !expected.customThemeStyle) {
+    return response;
+  }
+  let actual;
+  let readbackError;
+  // 只重试查询，避免重复上传资源或用旧快照再次覆盖设置。
+  for (let attempt = 0; attempt < 3; attempt++) {
+    if (attempt) { await new Promise((resolve) => setTimeout(resolve, attempt * 250)); }
+    try {
+      actual = getThemeSettings(await fetchCurrentApp(params.appType, authRef));
+      readbackError = undefined;
+      if (themeSettingsMatch(expected, actual)) {
+        return { ...response, themeVerification: { verified: true, ...actual } };
+      }
+    } catch (error) {
+      readbackError = error.message;
+    }
+  }
+  return {
+    success: false,
+    errorCode: 'APP_THEME_NOT_PERSISTED',
+    errorMsg: t('update_app.theme_not_persisted'),
+    themeVerification: { verified: false, expected, actual, readbackError },
+  };
+}
+
 async function applyCustomThemeUpdate(appType, themeParams, authRef) {
   const params = {
     ...themeParams,
     appType,
-    navTheme: themeParams.navTheme || 'light',
-    logoSource: themeParams.logoSource || 'appIcon',
-    layoutDirection: normalizeLayoutDirection(themeParams.layoutDirection || 'side'),
+    layoutDirection: normalizeLayoutDirection(themeParams.layoutDirection),
   };
   assertNavTheme(params.navTheme);
   assertLogoSource(params.logoSource);
 
   const themeFile = readThemeCssFile(params.themeFile);
   params.themeColor = themeFile.themeColor;
-  const currentApp = await fetchCurrentApp(appType, authRef);
   const uploadResponse = await requestWithAutoLogin(
     (auth) => uploadCustomThemeFile(appType, params.themeFile, auth),
     authRef
   );
   params.customThemeStyle = buildCustomThemeStyle(uploadResponse);
 
-  return requestWithAutoLogin((auth) => {
-    const requestPath = `/${appType}/query/app/updateApp.json?_api=Form.updateApp&_mock=false&_stamp=${Date.now()}`;
-    return httpPost(
-      auth.baseUrl,
-      requestPath,
-      querystring.stringify(buildUpdateAppPostData(params, currentApp, auth))
-    );
-  }, authRef);
+  return saveAppSettings(params, authRef);
 }
 
 async function run(args) {
@@ -444,7 +511,10 @@ async function run(args) {
     printUsage();
     throwUsage(t('update_app.missing_update_field'), t('update_app.usage'));
   }
-  assertPresetThemeKey(params.colour);
+  assertAppThemeKey(params.colour);
+  if (params.colour && params.colour !== 'custom' && (params.themeFile || params.themeColor)) {
+    throw new Error(t('update_app.theme_preset_conflict'));
+  }
   params.themeColor = normalizeThemeColor(params.themeColor);
   assertNavTheme(params.navTheme);
   assertLogoSource(params.logoSource);
@@ -482,29 +552,16 @@ async function run(args) {
     warn(t('update_app.layout_notice'));
   }
 
-  const currentApp = shellUpdate ? await fetchCurrentApp(params.appType, authRef) : null;
-  if (params.themeFile) {
-    const uploadResponse = await requestWithAutoLogin(
-      (auth) => uploadCustomThemeFile(params.appType, params.themeFile, auth),
-      authRef
-    );
-    params.customThemeStyle = buildCustomThemeStyle(uploadResponse);
-  }
-  const requestPath = shellUpdate
-    ? `/${params.appType}/query/app/updateApp.json?_api=Form.updateApp&_mock=false&_stamp=${Date.now()}`
-    : `/query/app/updateAppName.json?_api=Form.updateAppName&_mock=false&_stamp=${Date.now()}`;
-
-  const response = await requestWithAutoLogin((auth) => {
-    const postDataObj = shellUpdate
-      ? buildUpdateAppPostData(params, currentApp, auth)
-      : buildUpdateAppNamePostData(params, auth);
-    const postData = querystring.stringify(postDataObj);
-    return httpPost(
-      auth.baseUrl,
-      requestPath,
-      postData
-    );
-  }, authRef);
+  const response = params.themeFile ? await applyCustomThemeUpdate(params.appType, params, authRef)
+    : shellUpdate ? await saveAppSettings(params, authRef) : await requestWithAutoLogin((auth) => {
+      const postDataObj = buildUpdateAppNamePostData(params, auth);
+      const postData = querystring.stringify(postDataObj);
+      return httpPost(
+        auth.baseUrl,
+        `/query/app/updateAppName.json?_api=Form.updateAppName&_mock=false&_stamp=${Date.now()}`,
+        postData
+      );
+    }, authRef);
 
   // 输出结果
   if (response && response.success) {
@@ -515,6 +572,7 @@ async function run(args) {
     console.log(JSON.stringify({
       success: true,
       appType: params.appType,
+      themeVerification: response.themeVerification,
       updatedFields: {
         name: params.name || undefined,
         desc: params.desc || undefined,
@@ -531,8 +589,9 @@ async function run(args) {
   } else {
     const errorMsg = response ? response.errorMsg || t('common.unknown_error') : t('common.request_failed');
     chalkResult(false, t('update_app.failed', errorMsg));
-    console.log(JSON.stringify({ success: false, error: errorMsg }));
-    throwCommandError(errorMsg);
+    console.log(JSON.stringify({ success: false, appType: params.appType, error: errorMsg,
+      errorCode: response && response.errorCode, themeVerification: response && response.themeVerification }));
+    throwCommandError(errorMsg, { code: response && response.errorCode, details: response && response.themeVerification });
   }
 }
 
@@ -548,4 +607,5 @@ module.exports = {
   normalizeLayoutDirection,
   syncSystemIconColor,
   applyCustomThemeUpdate,
+  saveAppSettings,
 };

package/lib/core/agent-capabilities.js

@@ -141,7 +141,16 @@ const BUILDER_CORE_COMMAND_IDS = Object.freeze([
   'get-permission',
   'save-permission',
   'create-app',
+  'design-plan.init',
+  'design-plan.materialize',
+  'design-plan.preview',
+  'design-plan.patch',
+  'sample',
+  'update-app',
+  'update-form-config',
+  'get-form-config',
   'create-form.create',
+  'create-form.batch',
   'create-form.icons',
   'create-page',
   'publish',
@@ -452,6 +461,11 @@ function buildFullAppArtifactRoute(manifest) {
     orchestrator_skill_id: workflow.orchestrator_skill_id,
     requirement_analysis_skill_id: workflow.requirement_analysis_skill_id,
     requirement_brief_path: workflow.requirement_brief_path,
+    design_mode_policy: workflow.design_mode_policy,
+    navigation_policy: workflow.navigation_policy,
+    plan_command_ids: workflow.plan_command_ids,
+    theme_command_ids: workflow.theme_command_ids,
+    navigation_command_ids: workflow.navigation_command_ids,
     artifact_generation: workflow.artifact_generation,
   };
 }