openyida 2026.10.9 → 2026.10.10-1

package/README.md

@@ -403,7 +403,7 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 | `openyida design-plan preview <build-plan.json> --part-file <module.json> [--json]` | Update plan drafts by module |
 | `openyida design-plan materialize <build-plan.json> [--from-preview \| --business-file <json> --visual-file <json>] [--output-dir <dir>] [--rebase-parts] [--check] [--json]` | Generate or update plan documents and theme with consistency checks |
 | `openyida design-plan patch <build-plan.json> --set <path=value> [--set <path=value> ...] [--materialize] [--output-dir <dir>] [--json]` | Patch plan fields and optionally sync documents and theme |
-| `openyida update-app <appType> [--name "..."] [--desc "..."] [--icon <name>] [--icon-color <color>] [--colour <key>] [--theme-color <color>] [--theme-file <css>] [--nav-theme light\|dark\|white\|gray] [--logo-source appIcon\|customImage] [--layout side\|top\|l_shape] [--hide-app-nav\|--show-app-nav]` | Update app info |
+| `openyida update-app <appType> [--name "..."] [--desc "..."] [--icon <name>] [--icon-color <color>] [--colour <key>] [--theme-color <color>] [--theme-file <css>] [--confirm-legacy-app-style] [--disable-custom-theme] [--nav-theme light\|dark\|white\|gray] [--logo-source appIcon\|customImage] [--layout side\|top\|l_shape] [--hide-app-nav\|--show-app-nav]` | Update app info |
 | `openyida upgrade-app-theme <appType> --explicit-request [--confirm \| --prepare --output-dir <dir>] [--json]` | Upgrade an AI-built legacy app theme (explicit request and ask_human confirmation required) |
 | `openyida app-online <appType> [--to-ding-app-center] [--show-app-center]` | Enable a Yida app |
 | `openyida app-offline <appType> [--to-ding-app-center] [--show-app-center]` | Disable a Yida app |

package/lib/app/update-app.js

@@ -14,6 +14,7 @@ const {
 } = require('../core/utils');
 const { createAuthRef } = require('../core/yida-client');
 const { t } = require('../core/i18n');
+const { redactSensitive } = require('../core/redact');
 const { buildYidaI18n } = require('../core/yida-i18n');
 const { throwCommandError, throwUsage } = require('../core/command-errors');
 const { assertAppThemeKey } = require('./theme-presets');
@@ -81,6 +82,8 @@ function parseArgs(args) {
     themeColor: null,
     themeFile: null,
     customThemeStyle: null,
+    confirmLegacyAppStyle: false,
+    disableCustomTheme: false,
     navTheme: null,
     logoSource: null,
     layoutDirection: null,
@@ -100,7 +103,7 @@ function parseArgs(args) {
   for (let i = 1; i < args.length; i++) {
     const arg = args[i];
     const nextArg = args[i + 1];
-    if (!['--hide-app-nav', '--show-app-nav'].includes(arg) &&
+    if (!['--hide-app-nav', '--show-app-nav', '--confirm-legacy-app-style', '--disable-custom-theme'].includes(arg) &&
         (!nextArg || nextArg.startsWith('--') || ['-n', '-d'].includes(nextArg))) {
       throwCommandError(t('cli_argument.invalid', arg), { code: 'CLI_INVALID_ARGUMENTS' });
     }
@@ -175,6 +178,12 @@ function parseArgs(args) {
           i++;
         }
         break;
+      case '--confirm-legacy-app-style':
+        result.confirmLegacyAppStyle = true;
+        break;
+      case '--disable-custom-theme':
+        result.disableCustomTheme = true;
+        break;
       case '--hide-app-nav':
         result.hideAppNav = 'y';
         break;
@@ -186,6 +195,7 @@ function parseArgs(args) {
     }
   }
 
+  assertCustomThemeOptions(result);
   return result;
 }
 
@@ -204,6 +214,7 @@ function hasShellUpdate(params) {
     params.colour ||
     params.themeColor ||
     params.themeFile ||
+    params.disableCustomTheme ||
     params.navTheme ||
     params.logoSource ||
     params.layoutDirection ||
@@ -240,6 +251,27 @@ function normalizeStoredLayoutDirection(layoutDirection, navType) {
   return 'side';
 }
 
+/** 保存协议跟随应用实际主题能力；缺失运行态字段时保留既有保存行为。 */
+function isLegacyNavigation(app) {
+  return pickAppField(app, 'appThemeEnable', 'APP_THEME_ENABLE') === 'n' ||
+    pickAppField(app, 'appThemeMode', 'APP_THEME_MODE') === 'legacy';
+}
+
+/** 旧 Shell 的布局协议与新版布局不同；保留已有旧值，不反写 navType。 */
+function resolveSavedLayoutDirection(layoutDirection, navType, app, explicit = false) {
+  if (!isLegacyNavigation(app)) {
+    return explicit ? normalizeLayoutDirection(layoutDirection) : normalizeStoredLayoutDirection(layoutDirection, navType);
+  }
+  if (['slide', 'ver', 'hoz'].includes(layoutDirection)) {return layoutDirection;}
+  const layout = explicit ? normalizeLayoutDirection(layoutDirection) : normalizeStoredLayoutDirection(layoutDirection, navType);
+  return { side: 'ver', top: 'hoz', l_shape: 'ver' }[layout];
+}
+
+/** 旧导航没有白/灰独立风格，降级到已有浅色；不改应用品牌色和自定义 CSS。 */
+function resolveSavedNavTheme(navTheme, app) {
+  return isLegacyNavigation(app) && ['white', 'gray'].includes(navTheme) ? 'light' : navTheme;
+}
+
 function pickAppField(currentApp, fieldName, configName) {
   if (currentApp[fieldName] !== undefined && currentApp[fieldName] !== null) {
     return currentApp[fieldName];
@@ -302,7 +334,81 @@ function buildUpdateAppNamePostData(params, authRef) {
   return postDataObj;
 }
 
+function assertCustomThemeOptions(params) {
+  const otherUpdates = ['name', 'desc', 'icon', 'iconColor', 'colour', 'themeColor', 'themeFile',
+    'customThemeStyle', 'navTheme', 'logoSource', 'layoutDirection'];
+  if (params.disableCustomTheme && (otherUpdates.some(key => params[key]) ||
+      (params.hideAppNav !== null && params.hideAppNav !== undefined))) {
+    throwCommandError(t('update_app.disable_theme_conflict'), { code: 'CLI_INVALID_ARGUMENTS' });
+  }
+}
+
+function disabledCustomThemeStyle(rawStyle) {
+  let style = rawStyle;
+  if (typeof style === 'string') {
+    try {style = JSON.parse(style);} catch (_) {style = null;}
+  }
+  if (!style || Array.isArray(style) || typeof style !== 'object' ||
+      typeof style.cssUrl !== 'string' || !style.cssUrl.trim()) {
+    throwCommandError(t('update_app.custom_theme_config_invalid'), { code: 'APP_CUSTOM_THEME_CONFIG_INVALID' });
+  }
+  return JSON.stringify({ ...style, enabled: false, iframePropagation: false });
+}
+
+// A disable operation preserves the exact latest basic settings, including empty values.
+function preserveBasicSettings(payload, app) {
+  const configKeys = {
+    colour: 'COLOUR', themeColor: 'THEME_COLOR', mode: 'APPMODE', type: 'APPTYPE', navLayout: 'NAVLAYOUT',
+    layoutDirection: 'LAY_OUT_DIRECTION', navType: 'NAVTYPE', navTheme: 'NAV_THEME', homepageLogo: 'HOMEPAGELOGO',
+    logoSource: 'LOGO_SOURCE', logoLink: 'LOGOLINK', systemLink: 'SYSTEMLINK', showAppTitle: 'SHOWAPPTITLE',
+    showIcon: 'SHOWICON', showNav: 'SHOWNAV', showCrumb: 'SHOWCRUMB', showAppCenter: 'SHOWAPPCENTER',
+    deviceType: 'DEVICETYPE', detailLayout: 'DETAIL_LAYOUT', procOperateRecordLayout: 'PROC_OPERATERECORD_LAYOUT',
+    navigation: 'NAVIGATION', pageHeader: 'PAGEHEADER', pageFooter: 'PAGEFOOTER',
+    addWaterMark: 'ADDWATERMARK', sentryMode: 'SENTRY_MODE', hideAppNav: 'HIDE_APP_NAV',
+  };
+  for (const [field, key] of Object.entries(configKeys)) {
+    const value = pickAppField(app, field, key);
+    if (value !== undefined && value !== null) {payload[field] = value;}
+    else {delete payload[field];}
+  }
+  for (const field of ['icon', 'iconUrl']) {
+    if (app[field] !== undefined && app[field] !== null) {payload[field] = app[field];}
+  }
+}
+
+function requireAppStyleConfirmation(params, context) {
+  const modern = pickAppField(context, 'appThemeEnable', 'APP_THEME_ENABLE') === 'y' &&
+    pickAppField(context, 'appThemeMode', 'APP_THEME_MODE') === 'modern';
+  if (!modern && params.confirmLegacyAppStyle !== true) {
+    throwCommandError(t('update_app.legacy_style_confirm_required'), {
+      code: 'LEGACY_APP_CUSTOM_THEME_CONFIRMATION_REQUIRED',
+      details: { appType: params.appType, applicationSettingsWritten: false, nextAction: 'ask_user_for_application_style_injection' },
+    });
+  }
+}
+
+// Runtime capability is resolved by the server. Stored APP_THEME_MODE alone is insufficient.
+async function checkAppStyleInjection(params, authRef) {
+  const html = await requestWithAutoLogin(auth => httpGet(auth.baseUrl,
+    `/${encodeURIComponent(params.appType)}/admin`, { _stamp: Date.now() }, { responseType: 'text' }), authRef);
+  const { parseThemeContext } = require('./upgrade-app-theme');
+  // Even human approval cannot waive target application and organization identity.
+  const identity = parseThemeContext(html, ['appType', 'corpId']);
+  if (identity.appType !== params.appType || !authRef.corpId || identity.corpId !== authRef.corpId) {
+    throwCommandError(t('upgrade_app_theme.context_failed'), { code: 'APP_THEME_CONTEXT_UNVERIFIED' });
+  }
+  let context;
+  try {
+    context = parseThemeContext(html, ['appType', 'corpId', 'appThemeEnable', 'appThemeMode']);
+  } catch (error) {
+    if (error.code !== 'APP_THEME_CONTEXT_UNVERIFIED') {throw error;}
+    return requireAppStyleConfirmation(params, {});
+  }
+  requireAppStyleConfirmation(params, context);
+}
+
 function buildUpdateAppPostData(params, currentApp = {}, authRef) {
+  assertCustomThemeOptions(params);
   assertAppThemeKey(params.colour);
   if (params.colour && params.colour !== 'custom' && (params.themeFile || params.customThemeStyle || params.themeColor)) {
     throw new Error(t('update_app.theme_preset_conflict'));
@@ -341,9 +447,8 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     mode: currentApp.mode || (currentApp.config && currentApp.config.APPMODE) || 'normal',
     type: currentApp.type || (currentApp.config && currentApp.config.APPTYPE) || 'single',
     navLayout: currentApp.navLayout || (currentApp.config && currentApp.config.NAVLAYOUT) || 'auto',
-    layoutDirection: params.layoutDirection
-      ? normalizeLayoutDirection(params.layoutDirection)
-      : normalizeStoredLayoutDirection(currentLayoutDirection, currentNavType),
+    layoutDirection: resolveSavedLayoutDirection(
+      params.layoutDirection || currentLayoutDirection, currentNavType, currentApp, !!params.layoutDirection),
     homepageLogo: currentApp.homepageLogo || (currentApp.config && currentApp.config.HOMEPAGELOGO) || '',
     logoSource: params.logoSource || currentApp.logoSource || (currentApp.config && currentApp.config.LOGO_SOURCE) || 'appIcon',
     logoLink: currentApp.logoLink || (currentApp.config && currentApp.config.LOGOLINK) || '',
@@ -370,7 +475,12 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
 
   // ThemeNavSetting 保存现有 navType；新布局由 layoutDirection 控制，不反写或补造旧字段。
   if (currentNavType) {postDataObj.navType = currentNavType;}
-  const navTheme = params.navTheme || currentNavTheme;
+  if (params.disableCustomTheme && !params.layoutDirection) {
+    if (currentLayoutDirection) {postDataObj.layoutDirection = currentLayoutDirection;}
+    else {delete postDataObj.layoutDirection;}
+  }
+  const navTheme = params.disableCustomTheme && !params.navTheme
+    ? currentNavTheme : resolveSavedNavTheme(params.navTheme || currentNavTheme, currentApp);
   if (navTheme) {postDataObj.navTheme = navTheme;}
   if (addWaterMark !== undefined && addWaterMark !== null) {
     postDataObj.addWaterMark = addWaterMark;
@@ -394,7 +504,10 @@ function buildUpdateAppPostData(params, currentApp = {}, authRef) {
     postDataObj.themeColor = currentThemeColor;
   }
 
-  if (params.colour && params.colour !== 'custom' && !params.customThemeStyle) {
+  if (params.disableCustomTheme) {
+    preserveBasicSettings(postDataObj, currentApp);
+    postDataObj.customThemeStyle = disabledCustomThemeStyle(currentCustomThemeStyle);
+  } else if (params.colour && params.colour !== 'custom' && !params.customThemeStyle) {
     // 切回平台预置主题时必须清空旧 CSS，避免 CUSTOM_THEME_STYLE 继续覆盖 colour。
     postDataObj.customThemeStyle = '';
   } else {
@@ -449,7 +562,7 @@ function themeSettingsMatch(expected, actual) {
   if (!expectedStyle || !actualStyle || typeof expectedStyle !== 'object' || typeof actualStyle !== 'object') {
     return expectedStyle === actualStyle;
   }
-  return ['enabled', 'iframePropagation'].every((key) => Boolean(expectedStyle[key]) === Boolean(actualStyle[key])) &&
+  return ['enabled', 'iframePropagation'].every((key) => expectedStyle[key] === actualStyle[key]) &&
     ['cssUrl', 'cssFileName'].every((key) => (expectedStyle[key] || '') === (actualStyle[key] || ''));
 }
 
@@ -459,14 +572,16 @@ function getRequestedNavigationSettings(params, payload) {
     .map((name) => [name, payload[name]]));
 }
 
-function getNavigationSettings(app, fields) {
-  const configKeys = { navTheme: 'NAV_THEME', layoutDirection: 'LAY_OUT_DIRECTION', hideAppNav: 'HIDE_APP_NAV', logoSource: 'LOGO_SOURCE' };
+function getNavigationSettings(app, fields, currentApp = app, rawLayout = false) {
+  const configKeys = { navTheme: 'NAV_THEME', layoutDirection: 'LAY_OUT_DIRECTION', hideAppNav: 'HIDE_APP_NAV', logoSource: 'LOGO_SOURCE', navType: 'NAVTYPE', homepageLogo: 'HOMEPAGELOGO' };
   return Object.fromEntries(fields.map((name) => {
     let value = pickAppField(app, name, configKeys[name]);
-    if (name === 'layoutDirection') {
+    if (name === 'layoutDirection' && !rawLayout) {
       const navType = pickAppField(app, 'navType', 'NAVTYPE');
       // A missing response field is not evidence that the requested default was saved.
-      value = value || navType ? normalizeStoredLayoutDirection(value, navType) : null;
+      value = isLegacyNavigation(currentApp)
+        ? (value || null)
+        : (value || navType ? normalizeStoredLayoutDirection(value, navType) : null);
     }
     return [name, value === undefined ? null : value];
   }));
@@ -474,18 +589,28 @@ function getNavigationSettings(app, fields) {
 
 /** updateApp 整包保存；读取最新配置后合并，并核验主题资源和本次请求的导航设置。 */
 async function saveAppSettings(params, authRef) {
+  assertCustomThemeOptions(params);
+  if (params.customThemeStyle) {await checkAppStyleInjection(params, authRef);}
   const currentApp = await fetchCurrentApp(params.appType, authRef);
   const payload = buildUpdateAppPostData(params, currentApp, authRef);
+  const submittedFields = params.disableCustomTheme ? redactSensitive({
+    customThemeStyle: JSON.parse(payload.customThemeStyle), colour: payload.colour, themeColor: payload.themeColor,
+    navType: payload.navType, navTheme: payload.navTheme, layoutDirection: payload.layoutDirection,
+    logoSource: payload.logoSource, homepageLogo: payload.homepageLogo,
+  }) : undefined;
   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; }
+  if (!response || !response.success) { return submittedFields ? { ...response, submittedFields } : response; }
 
   const expected = getThemeSettings(payload);
-  const verifyTheme = !!(params.colour || params.themeColor || params.customThemeStyle || expected.themeColor || expected.customThemeStyle);
-  const expectedNavigation = getRequestedNavigationSettings(params, payload);
+  const verifyTheme = !!(params.colour || params.themeColor || params.customThemeStyle || params.disableCustomTheme || expected.themeColor || expected.customThemeStyle);
+  const expectedNavigation = params.disableCustomTheme
+    ? Object.fromEntries(['navType', 'navTheme', 'layoutDirection', 'hideAppNav', 'logoSource', 'homepageLogo']
+      .filter(field => Object.hasOwn(payload, field)).map(field => [field, payload[field]]))
+    : getRequestedNavigationSettings(params, payload);
   const navigationFields = Object.keys(expectedNavigation);
   if (!verifyTheme && !navigationFields.length) {return response;}
   let actual;
@@ -499,12 +624,13 @@ async function saveAppSettings(params, authRef) {
     try {
       const app = await fetchCurrentApp(params.appType, authRef);
       actual = getThemeSettings(app);
-      actualNavigation = getNavigationSettings(app, navigationFields);
+      actualNavigation = getNavigationSettings(app, navigationFields, currentApp, params.disableCustomTheme);
       readbackError = undefined;
       themeVerified = !verifyTheme || themeSettingsMatch(expected, actual);
       navigationVerified = navigationFields.every((name) => expectedNavigation[name] === actualNavigation[name]);
       if (themeVerified && navigationVerified) {
         return { ...response,
+          ...(submittedFields ? { submittedFields } : {}),
           ...(verifyTheme ? { themeVerification: { verified: true, ...actual } } : {}),
           ...(navigationFields.length ? { navigationVerification: { verified: true, ...actualNavigation } } : {}),
         };
@@ -517,6 +643,7 @@ async function saveAppSettings(params, authRef) {
   }
   return {
     success: false,
+    ...(submittedFields ? { submittedFields } : {}),
     errorCode: themeVerified ? 'APP_NAVIGATION_NOT_PERSISTED' : 'APP_THEME_NOT_PERSISTED',
     errorMsg: t(themeVerified ? 'update_app.navigation_not_persisted' : 'update_app.theme_not_persisted'),
     ...(verifyTheme ? { themeVerification: themeVerified
@@ -536,6 +663,8 @@ async function applyCustomThemeUpdate(appType, themeParams, authRef) {
   assertNavTheme(params.navTheme);
   assertLogoSource(params.logoSource);
 
+  assertCustomThemeOptions(params);
+  await checkAppStyleInjection(params, authRef);
   const themeFile = readThemeCssFile(params.themeFile);
   params.themeColor = themeFile.themeColor;
   const uploadResponse = await requestWithAutoLogin(
@@ -544,7 +673,13 @@ async function applyCustomThemeUpdate(appType, themeParams, authRef) {
   );
   params.customThemeStyle = buildCustomThemeStyle(uploadResponse);
 
-  return saveAppSettings(params, authRef);
+  try {
+    return await saveAppSettings(params, authRef);
+  } catch (error) {
+    error.details = { ...error.details, appType, uploadedResource: params.customThemeStyle,
+      applicationSettingsVerified: false };
+    throw error;
+  }
 }
 
 async function run(args) {
@@ -570,6 +705,7 @@ async function run(args) {
     !params.colour &&
     !params.themeColor &&
     !params.themeFile &&
+    !params.disableCustomTheme &&
     !params.navTheme &&
     !params.logoSource &&
     !params.layoutDirection &&
@@ -579,6 +715,7 @@ async function run(args) {
     printUsage();
     throwUsage(t('update_app.missing_update_field'), t('update_app.usage'));
   }
+  assertCustomThemeOptions(params);
   assertAppThemeKey(params.colour);
   if (params.colour && params.colour !== 'custom' && (params.themeFile || params.themeColor)) {
     throw new Error(t('update_app.theme_preset_conflict'));
@@ -635,13 +772,14 @@ async function run(args) {
   if (response && response.success) {
     const details = [['appType', params.appType]];
     if (params.name) {details.push(['Name', params.name]);}
-    chalkResult(true, t('update_app.success'), details);
+    chalkResult(true, t(params.disableCustomTheme ? 'update_app.custom_theme_disabled' : 'update_app.success'), details);
 
     console.log(JSON.stringify({
       success: true,
       appType: params.appType,
       themeVerification: response.themeVerification,
       navigationVerification: response.navigationVerification,
+      ...(params.disableCustomTheme ? { runtimeVerification: { verified: false } } : {}),
       updatedFields: {
         name: params.name || undefined,
         desc: params.desc || undefined,
@@ -649,6 +787,7 @@ async function run(args) {
         colour: params.colour || undefined,
         themeColor: params.themeColor || undefined,
         themeFile: params.themeFile || undefined,
+        customThemeStyle: params.disableCustomTheme ? response.themeVerification.customThemeStyle : undefined,
         navTheme: params.navTheme || undefined,
         logoSource: params.logoSource || undefined,
         layoutDirection: params.layoutDirection || undefined,
@@ -659,6 +798,7 @@ async function run(args) {
     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, appType: params.appType, error: errorMsg,
+      submittedFields: response && response.submittedFields,
       errorCode: response && response.errorCode, themeVerification: response && response.themeVerification,
       navigationVerification: response && response.navigationVerification }));
     throwCommandError(errorMsg, { code: response && response.errorCode,

package/lib/app/upgrade-app-theme.js

@@ -24,7 +24,7 @@ function parseArgs(args = []) {
 }
 
 // Read only literal fields from the server-rendered admin configuration. Never execute HTML/JS.
-function parseThemeContext(html) {
+function parseThemeContext(html, wanted = ['appType', 'corpId', 'agentAppType']) {
   const fail = () => throwCommandError(t('upgrade_app_theme.context_failed'), { code: 'APP_THEME_CONTEXT_UNVERIFIED' });
   if (typeof html !== 'string') { return fail(); }
   const contexts = [];
@@ -40,7 +40,6 @@ function parseThemeContext(html) {
           expr.left.object.name !== 'window' || expr.left.property.name !== 'pageConfig') { continue; }
       if (expr.right.type !== 'ObjectExpression') { return fail(); }
       const context = {};
-      const wanted = ['appType', 'corpId', 'agentAppType'];
       for (const prop of expr.right.properties) {
         if (prop.type === 'SpreadElement' || prop.computed) { return fail(); }
         const key = prop.key.name || prop.key.value;
@@ -71,17 +70,34 @@ async function readThemeEligibility(appType, auth) {
   return context;
 }
 
+/** 升级时将历史导航协议转换为新版值，保留导航结构与已配置的新值。 */
+function resolveModernNavigationConfig(previous) {
+  const layout = previous.LAY_OUT_DIRECTION;
+  const navType = previous.NAVTYPE;
+  const targets = {};
+  // 旧版 ver 默认是侧导；只有明确的 top_side 结构才恢复 L 型。
+  const layouts = { slide: 'side', ver: navType === 'top_side' ? 'l_shape' : 'side',
+    hoz: navType === 'top_side' ? 'l_shape' : 'top' };
+  if (Object.hasOwn(layouts, layout)) {targets.LAY_OUT_DIRECTION = layouts[layout];}
+  // APP_THEME_MODE=modern 的 light 已是新版浅品牌色，重复升级不能把它变成 white。
+  const wasLegacy = previous.APP_THEME_MODE !== 'modern';
+  const colors = { default: 'light', light: 'white', dark: 'dark', clear: 'white' };
+  if (wasLegacy && Object.hasOwn(colors, previous.NAV_THEME)) {targets.NAV_THEME = colors[previous.NAV_THEME];}
+  return targets;
+}
+
 // Both attestations are required even for callers that bypass the CLI runner.
 // They record the agent's authorization checks; they cannot prove a human reply.
 async function upgradeAppTheme(params, authRef) {
   if (!params.appType || !/^[A-Za-z0-9_-]+$/.test(params.appType)) {
     throwUsage(t('upgrade_app_theme.usage'));
   }
+  const auth = authRef || createAuthRef();
+  // Reject ineligible apps before offering upgrade confirmation; flags cannot bypass this gate.
+  await readThemeEligibility(params.appType, auth);
   if (params.explicitRequest !== true || params.confirm !== true) {
     throwCommandError(t('upgrade_app_theme.confirm_required'), { code: 'APP_THEME_CONFIRMATION_REQUIRED' });
   }
-  const auth = authRef || createAuthRef();
-  await readThemeEligibility(params.appType, auth);
   const targets = { CREATED_WITH_MODERN_THEME: 'y', APP_THEME_MODE: 'modern' };
   const request = (endpoint, fields) => requestWithAutoLogin((current) => httpPost(
     current.baseUrl,
@@ -97,13 +113,18 @@ async function upgradeAppTheme(params, authRef) {
     }
     return emptyContent ? null : response.content;
   };
-  // Read both before writing anything. The two endpoints are not transactional.
+  // Read theme and navigation before writing anything; these endpoints are not transactional.
   const previous = {};
-  for (const key of Object.keys(targets)) { previous[key] = await readConfig(key); }
+  for (const key of [...Object.keys(targets), 'LAY_OUT_DIRECTION', 'NAV_THEME', 'NAVTYPE']) {
+    previous[key] = await readConfig(key);
+  }
+  const navigationTargets = resolveModernNavigationConfig(previous);
+  // 先写导航，再启用主题，避免配色/布局迁移失败后留下已启用的新主题。
+  const allTargets = { ...navigationTargets, ...targets };
   const verifiedWrites = [];
   let attemptedKey;
   try {
-    for (const [key, value] of Object.entries(targets)) {
+    for (const [key, value] of Object.entries(allTargets)) {
       if (previous[key] === value) { continue; }
       attemptedKey = key;
       const response = await request('updateSingleConfig', { key, value });
@@ -115,9 +136,9 @@ async function upgradeAppTheme(params, authRef) {
       }
       verifiedWrites.push(key);
     }
-    // Verify the pair again after writes; never claim both succeeded from only one response.
+    // Verify all migration targets again after writes; each value needs independent readback.
     if (attemptedKey) {
-      for (const [key, value] of Object.entries(targets)) {
+      for (const [key, value] of Object.entries(allTargets)) {
         if (await readConfig(key) !== value) {
           throwCommandError(t('upgrade_app_theme.verify_failed'), { code: 'APP_THEME_NOT_PERSISTED' });
         }
@@ -133,7 +154,10 @@ async function upgradeAppTheme(params, authRef) {
   return { success: true, appType: params.appType, changed: verifiedWrites.length > 0,
     verified: true, verificationScope: 'config', runtimeVerified: false, appUpgradeComplete: false,
     nextStep: 'migrate-pages-and-clean-form-styles-with-yida-upgrade-app-theme', previous,
-    createdWithModernTheme: 'y', appThemeMode: 'modern', updatedKeys: verifiedWrites };
+    createdWithModernTheme: 'y', appThemeMode: 'modern', navigation: {
+      layoutDirection: navigationTargets.LAY_OUT_DIRECTION || previous.LAY_OUT_DIRECTION,
+      navTheme: navigationTargets.NAV_THEME || previous.NAV_THEME,
+    }, updatedKeys: verifiedWrites };
 
 }
 
@@ -145,11 +169,14 @@ async function run(args = []) {
     return;
   }
   if (params.prepare) {
-    if (!params.appType || !/^[A-Za-z0-9_-]+$/.test(params.appType) || !params.explicitRequest || !params.outputDir) {
+    if (!params.appType || !/^[A-Za-z0-9_-]+$/.test(params.appType)) {
       throwUsage(t('upgrade_app_theme.prepare_output_required'));
     }
     const auth = createAuthRef();
     await readThemeEligibility(params.appType, auth);
+    if (!params.explicitRequest || !params.outputDir) {
+      throwUsage(t('upgrade_app_theme.prepare_output_required'));
+    }
     const { prepareAppThemeUpgrade } = require('./prepare-app-theme-upgrade');
     const prepared = await prepareAppThemeUpgrade(params, auth);
     if (!prepared.success) {

package/lib/core/command-manifest.js

@@ -1139,7 +1139,7 @@ const COMMAND_GROUPS = [
           { name: 'json', type: 'boolean', source: 'option', builder_options: ['--json'] },
         ],
       }),
-      command('update-app', ['update-app'], 'update-app <appType> [--name "..."] [--desc "..."] [--icon <name>] [--icon-color <color>] [--colour <key>] [--theme-color <color>] [--theme-file <css>] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape] [--hide-app-nav|--show-app-nav]', 'help.cmd_update_app', {
+      command('update-app', ['update-app'], 'update-app <appType> [--name "..."] [--desc "..."] [--icon <name>] [--icon-color <color>] [--colour <key>] [--theme-color <color>] [--theme-file <css>] [--confirm-legacy-app-style] [--disable-custom-theme] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape] [--hide-app-nav|--show-app-nav]', 'help.cmd_update_app', {
         args: [
           { name: 'appType', type: 'string', required: true, source: 'positional', position: 0 },
           { name: 'name', type: 'string', source: 'option', builder_options: ['--name', '-n'] },
@@ -1149,15 +1149,19 @@ const COMMAND_GROUPS = [
           { name: 'colour', type: 'string', source: 'option', builder_options: ['--colour', '--theme'], description: 'Platform theme key or custom; CSS colors belong in themeColor.' },
           { name: 'themeColor', type: 'string', source: 'option', builder_options: ['--theme-color', '--themeColor'], description: 'App primary color; themeFile supplies the effective color when both are provided.' },
           { name: 'themeFile', type: 'file', source: 'option', builder_options: ['--theme-file', '--custom-theme-file'], description: 'Completed application theme CSS, not a placeholder authoring bundle. Reads --color-brand1-6, uploads CSS and sets colour=custom. Supports app-theme.css or app_theme.css; use the actual generated path.' },
-          { name: 'navTheme', type: 'string', source: 'option', builder_options: ['--nav-theme', '--navTheme'], description: 'Platform value: light, dark, white or gray. Generated design flows pass the selected template-derived light/dark value explicitly; this option has no implicit light default.' },
+          { name: 'confirmLegacyAppStyle', type: 'boolean', source: 'option', builder_options: ['--confirm-legacy-app-style'], description: 'Attests to an affirmative human reply for this exact legacy/unknown app and reviewed CSS scope; never infer consent from a request to beautify a page.' },
+          { name: 'disableCustomTheme', type: 'boolean', source: 'option', builder_options: ['--disable-custom-theme'], description: 'Disable app-level CSS by serializing the existing customThemeStyle with boolean enabled=false and iframePropagation=false. Retain cssUrl/cssFileName and other basic settings. Cannot be combined with other updates.' },
+          { name: 'navTheme', type: 'string', source: 'option', builder_options: ['--nav-theme', '--navTheme'], description: 'Platform value: light, dark, white or gray; disabled/legacy apps persist white/gray as light. Generated design flows pass the selected template-derived light/dark value explicitly; this option has no implicit light default.' },
           { name: 'logoSource', type: 'string', source: 'option', builder_options: ['--logo-source', '--logoSource'], description: 'appIcon or customImage; customImage requires an existing homepageLogo.' },
-          { name: 'layoutDirection', type: 'string', source: 'option', builder_options: ['--layout', '--layout-direction', '--layoutDirection'], description: 'side, top or l_shape.' },
+          { name: 'layoutDirection', type: 'string', source: 'option', builder_options: ['--layout', '--layout-direction', '--layoutDirection'], description: 'side, top or l_shape. Disabled or legacy apps persist ver, hoz or ver respectively.' },
           { name: 'hideAppNav', type: 'boolean', source: 'option', builder_options: ['--hide-app-nav'] },
           { name: 'showAppNav', type: 'boolean', source: 'option', builder_options: ['--show-app-nav'] },
         ],
         notes: [
+          'Before uploading or binding CSS, read server-resolved appThemeEnable/appThemeMode and verify app/corp identity. Only y/modern allows automatic app-level injection. Legacy or unknown capability requires asking the human about this exact application and reviewed stylesheet scope before --confirm-legacy-app-style; unavailable confirmation means stop before uploading. Prefer page-scoped styles for legacy applications. --disable-custom-theme retains the existing resource URL/name and sets enabled/iframePropagation to boolean false. Never submit an empty style or remove the resource URL. Inspect strict configuration readback, then refresh the actual visit page to verify link#yida-app-custom-theme is absent and the CSS is not requested; HTTP success alone is insufficient.',
           'Upload application CSS with --theme-file; the primary color is read from CSS and saved with the theme resource. Edit navigation radius, three border states and selected shadow in design.md, regenerate CSS, then upload; these tokens are not separate update-app flags. Unknown options, missing values and combined --hide-app-nav/--show-app-nav are rejected.',
           'One design document and theme CSS cover navigation, application shell, native forms, custom pages and record details. tokens.application-global.appearance.navigation defines navigation surfaces, text and interaction states, logo, groups, search, popups, borders, radius and density. Platform-supported tokens are applied through the active navigation mode; page content consumes the same application theme.',
+          'Applications with appThemeEnable=n or appThemeMode=legacy persist side/top/l_shape as ver/hoz/ver and map unsupported white/gray navigation colors to legacy light. Existing legacy layouts and navType are preserved. Unknown theme capability keeps the existing save protocol.',
           'navigationVerification reads back explicitly requested navTheme, layoutDirection, hideAppNav and logoSource. A mismatch returns APP_NAVIGATION_NOT_PERSISTED and a nonzero exit code; only readback is retried. themeVerification independently verifies the uploaded theme resource. Verify rendered navigation, form, custom page and record detail after both checks pass.',
           'For generated design artifacts, pass themeProfile.navTheme from design.md to --nav-theme. Do not infer it from the business brief or omit it expecting a light default.',
           'Platform preset keys are used independently of --theme-file and --theme-color. Choose --hide-app-nav or --show-app-nav to set navigation visibility.',
@@ -1173,7 +1177,7 @@ const COMMAND_GROUPS = [
           { name: 'json', type: 'boolean', source: 'option', builder_options: ['--json'] },
           { name: 'confirm', type: 'boolean', source: 'option', builder_options: ['--confirm'] },
         ],
-        notes: ['--prepare reads remote schemas/source bundles into a new local backup directory and produces a per-resource migration plan without remote writes; it requires explicit upgrade intent but no mutation confirmation. Before --confirm, use the independent upgrade Skill to prepare/review sources, migrate legacy JSX to Canvas without business/layout changes, and remove verified form-detail style injection. Only mutate after an explicit user request to upgrade an existing app to the modern theme AND an affirmative ask_human reply for that app. These flags attest to both checks; they do not replace human confirmation. If ask_human is unavailable, stop before mutation. Only agentAppType=local/cloud/qwenwork qualifies; verify target app/corp identity. Do not check V4, appThemeEnable, organization theme gray or upgrade gray. After ask_human approval, persist CREATED_WITH_MODERN_THEME=y and APP_THEME_MODE=modern, then read both back. Report partial/unknown writes on failure. Success verifies configuration only, not page migration or runtime rendering. appUpgradeComplete remains false until the Skill verifies all page/form migrations.'],
+        notes: ['--prepare reads remote schemas/source bundles into a new local backup directory and produces a per-resource migration plan without remote writes; it requires explicit upgrade intent but no mutation confirmation. Before --confirm, use the independent upgrade Skill to prepare/review sources, migrate legacy JSX to Canvas without business/layout changes, and remove verified form-detail style injection. Only mutate after an explicit user request to upgrade an existing app to the modern theme AND an affirmative ask_human reply for that app. These flags attest to both checks; they do not replace human confirmation. If ask_human is unavailable, stop before mutation. The CLI itself checks server-derived agentAppType and app/corp identity before offering any confirmation or preparing backups. agentAppType comes from FROM_BUILDER_AI=y plus BUILDER_AI_SOURCE; source alone or FROM_AI does not qualify. Only local/cloud/qwenwork qualifies. Reject non-AI or unverified apps without offering an upgrade or exposing source fields. Skill guidance and confirmation flags cannot bypass this gate. Do not check V4, appThemeEnable, organization theme gray or upgrade gray. After ask_human approval, migrate legacy navigation layout and colors before persisting CREATED_WITH_MODERN_THEME=y and APP_THEME_MODE=modern, then read all changed settings back. Already modern navigation colors stay unchanged. Report partial/unknown writes on failure. Success verifies configuration only, not page migration or runtime rendering. appUpgradeComplete remains false until the Skill verifies all page/form migrations.'],
       }),
       command('app-online', ['app-online'], 'app-online <appType> [--to-ding-app-center] [--show-app-center]', 'help.cmd_app_online'),
       command('app-offline', ['app-offline'], 'app-offline <appType> [--to-ding-app-center] [--show-app-center]', 'help.cmd_app_offline'),
@@ -1889,7 +1893,7 @@ function summarizeLocalizedCommands(commands) {
         plan_command_ids: ['design-plan.catalog', 'design-plan.init', 'design-plan.preview', 'design-plan.materialize', 'design-plan.patch'],
         theme_command_ids: ['sample', 'create-app', 'update-app'],
         navigation_command_ids: { platform: ['update-app', 'nav-group'], custom: ['update-app', 'update-form-config', 'get-form-config'] },
-        navigation_policy: 'Before PRD planning in Fast and Plan, the agent determines navigation ownership and layout from business context. Follow yida-design/references/navigation-decision.md for entry and layout decisions. Preserve explicit user requirements and existing navigation for local changes; resource-only requests operate on their specified resources and settings. Use native navigation by default for the application workspace, and custom navigation only for an explicitly justified application-level branded menu or special navigation interaction. A service frontend defaults to one coding page with its own menu and all selected business views; a single-step entry can use navigation.type=none. Choose backend native or coding pages by task efficiency. Backend coding pages in platform-shell are content-only: platform menus own cross-module navigation; local Tabs cover categories or states of the current task only. Never turn the management entry menu into a second page navbar, sidebar or module Tabs. Persistent filters/state alone do not justify custom application navigation. Plan handoff pages include derived navigationPolicy; Fast records the same boundary. Do not hide platform navigation to repair duplicate page menus. Store application navigation in navigationType and standalone entry menus in pageSpecHandoff.navigation. Configure a custom frontend menu at page scope and preserve workspace navigation. Record type/source/reason/variant using ai_default for agent ownership decisions and user_selected for explicit user requirements. Include navigation in the overall Plan confirmation; Fast implements the recorded decision. Platform navigation uses update-app --layout top|side|l_shape --show-app-nav, persisting layoutDirection and hideAppNav=n. Preserve stored navType. Without --layout, normalize legacy layoutDirection and navType using the application layout compatibility rules (hoz plus top_side means l_shape; missing layout uses top_fold/top_side for top/l_shape). Apply shell top_fold/none overrides at page scope. Application-wide custom side/top/mixed/dock uses app hiding plus per-page hiding within scope; a standalone frontend in a platform-navigation app uses only page configuration. Read back layoutDirection, hideAppNav and each configured page, then verify the planned frontend and workspace links. Navigation structure is separate from tone. Navigation tone is derived from the final selected theme template, never guessed from the business brief or implicitly defaulted to light; apply that explicit value with update-app --nav-theme. Custom top navigation defaults to edge-to-edge, not floating. Over a hero image, start transparent, add a surface on scroll, restore transparency at the top; expanded menus stay readable. Follow yida-design/references/page-continuity.md; floating requires an explicit design.',
+        navigation_policy: 'Before PRD planning in Fast and Plan, the agent determines navigation ownership and layout from business context. Follow yida-design/references/navigation-decision.md for entry and layout decisions. Preserve explicit user requirements and existing navigation for local changes; resource-only requests operate on their specified resources and settings. Use native navigation by default for the application workspace, and custom navigation only for an explicitly justified application-level branded menu or special navigation interaction. A service frontend defaults to one coding page with its own menu and all selected business views; a single-step entry can use navigation.type=none. Choose backend native or coding pages by task efficiency. Backend coding pages in platform-shell are content-only: platform menus own cross-module navigation; local Tabs cover categories or states of the current task only. Never turn the management entry menu into a second page navbar, sidebar or module Tabs. Persistent filters/state alone do not justify custom application navigation. Plan handoff pages include derived navigationPolicy; Fast records the same boundary. Do not hide platform navigation to repair duplicate page menus. Store application navigation in navigationType and standalone entry menus in pageSpecHandoff.navigation. Configure a custom frontend menu at page scope and preserve workspace navigation. Record type/source/reason/variant using ai_default for agent ownership decisions and user_selected for explicit user requirements. Include navigation in the overall Plan confirmation; Fast implements the recorded decision. Platform navigation uses update-app --layout top|side|l_shape --show-app-nav, persisting layoutDirection and hideAppNav=n. Preserve stored navType. For appThemeEnable=n or appThemeMode=legacy, persist side/top/l_shape as ver/hoz/ver and white/gray as light; without --layout preserve stored slide/ver/hoz. For modern or unknown capability, normalize layoutDirection and navType using the existing application layout compatibility rules (hoz plus top_side means l_shape; missing layout uses top_fold/top_side for top/l_shape). Apply shell top_fold/none overrides at page scope. Application-wide custom side/top/mixed/dock uses app hiding plus per-page hiding within scope; a standalone frontend in a platform-navigation app uses only page configuration. Read back layoutDirection, hideAppNav and each configured page, then verify the planned frontend and workspace links. Navigation structure is separate from tone. Navigation tone is derived from the final selected theme template, never guessed from the business brief or implicitly defaulted to light; apply that explicit value with update-app --nav-theme. Custom top navigation defaults to edge-to-edge, not floating. Over a hero image, start transparent, add a surface on scroll, restore transparency at the top; expanded menus stay readable. Follow yida-design/references/page-continuity.md; floating requires an explicit design.',
         design_mode_policy: 'Analyze requirements first with yida-requirement-analysis: read only necessary sources before the first question, offer concrete core-function candidates, clarify key usage, and preserve explicit scope and valid answers. Initial intake focuses on core functions and actual usage. Record actual user replies; proceed with dependent planning after a reply or explicit delegation. First-time builds include new apps and existing apps without business pages. After intake, reuse explicit mode choices and detailed supplied plans; if the user delegates the mode or asks for no more questions, use Fast unless Plan is explicit; otherwise, if the mode is unspecified, ask whether to prepare a PRD for confirmation (Plan, more detailed and slower) or build from the supplied requirements (Fast). Without detailed requirements, offer Fast and Plan neutrally. intake.confirmed records scope and key-usage clarification; the plan revision tracks plan approval separately. Fast and Plan share one three-direction visual generation rule. Fast compares exactly three directions internally and keeps the selected result. When Plan is explicit and the user has not supplied a complete visual direction, generate exactly three directions and use ask_human for the style choice before design-plan init; do not wait for the user to request a comparison. Planning preparation derives page scenes, selected theme mapping and navigation structure before init; mark AI suggestions and apply navigation_policy. Existing business apps only clarify the current change. A named resource-only request with explicitScope.allowInferredResources=false keeps planning within the specified resources. When theme mapping is missing, query design-plan catalog once and reuse its themes and pagePatterns. Init returns authoring.pendingFields and context with typed examples; complete pending facts and review coverage before setting ready=true. Reuse one complete agent-capabilities summary per unchanged environment. Standard Plan uses design-plan init parallelTasks, then executes the returned materialize.command exactly once with business-file and visual-file; preview and --from-preview are only for explicitly incremental large plans. Present the current plan without revision numbers in user-visible titles, summaries, attachments or questions. Keep revision in internal confirmation fields, validate it before building, and execute its generated artifacts.',
         product_design_policy: 'yida-requirement-analysis owns shared facts and first-time intake. yida-prd owns business planning; yida-design owns visual design. Reuse the same confirmed brief and supplied details. Prepare business and base visuals concurrently, then bind visuals to settled page tasks. yida-app merges and checks the artifacts before creating resources. Plan authors scope, data and rules, page organization, business interactions and acceptance once. Ordered blocks {name,purpose} supply default priority and content layers; explicit designs remain authoritative. Project-specific acceptance criteria are merged with generated resource checks. Plan uses the compact authoring contract and selected theme context; the CLI reads full templates and renders all artifacts. Fast, Plan and single-page design share yida-design/templates/design-themes and the same three-direction generation rule. Theme templates declare application-global variables from basic-tokens.json with fixed typography, spacing and Tooltip colors, plus scoped custom-page variables; component recipes consume those variables. Each selected template is the authority for navTheme, its six navigation color tokens, and its selected-item shadow token; free-creative authors its own navigation tone and tokens. Explicit project customization stays in visualStyle.tokens. The CLI declares each fixed application palette once in a shared :root and platform-mode selector block. The CLI preserves mode-independent navigation appearance tokens. Light, dark, white and gray mode classes consume the same project tokens; navTheme remains platform metadata, not a second palette. Legacy generated mode blocks are consolidated on update, while unrelated custom CSS is preserved.',
         ui_guidance_policy: 'Page implementation consumes yida-prd prd.md for positioning, information architecture, page prototype, native form entry policy, material strategy, business-specific checks, resource creation order, page implementation delivery order, navigation order, and acceptance criteria; it consumes yida-design design.md for app custom theme CSS delivery, themeColor/navTheme, visual states, visualScaffold, surface material, rounded rules, density rules, components, state styling, and page-level imageNeed. When a page is imageNeed=required, or beneficial with declared image slots, yida-image-assets prepares a traceable asset manifest alongside page layout and interaction work; wait for final images only at that page\'s image binding and acceptance. imageNeed=none skips the branch. prd.md and design.md remain the only design sources of truth. Page implementation may extract page-spec.json as a derived implementation handoff from prd.md + design.md; conflicts are resolved by sending business conflicts to yida-prd and visual conflicts to yida-design before regenerating the spec. Core normal forms default to 1-3 business sample records before page implementation, followed by query readback. An explicit opt-out, configuration dictionary, sensitive data, or lack of safely constructible values requires a recorded skip reason. Screenshots, public sharing, data-source deep binding, and fine navigation grouping are optional after explicit user request or PRD acceptance criteria.',

package/lib/core/locales/en.js

@@ -1175,15 +1175,19 @@ Examples:
 
   // ── lib/update-app.js ─────────────────────────────
   update_app: {
+    legacy_style_confirm_required: 'Application CSS is discouraged for legacy or unverified themes. Review CSS scope and ask the human to confirm injection into this exact application (navigation, forms and visit pages may be affected). Only then pass --confirm-legacy-app-style. Otherwise use page-scoped styles.',
+    disable_theme_conflict: '--disable-custom-theme only disables CSS and cannot be combined with other application updates.',
+    custom_theme_config_invalid: 'customThemeStyle is missing, malformed, or lacks a nonempty cssUrl. No disable request was submitted; inspect the latest app configuration.',
+    custom_theme_disabled: 'Custom theme CSS is disabled and resource settings are retained; runtime page verification remains pending.',
     theme_preset_conflict: 'A preset colour cannot be combined with custom CSS or themeColor. Use --colour custom or omit --colour.',
     custom_theme_color_required: 'colour=custom requires a theme file or a valid themeColor. Pass --theme-file or --theme-color.',
-    theme_not_persisted: 'App theme readback failed or did not match the saved settings. The CSS resource binding is unverified. Inspect themeVerification and retry update-app <appType> --theme-file <css>; do not refresh the app.',
+    theme_not_persisted: 'App theme readback failed or did not match the saved settings. CSS binding or removal is unverified. Inspect expected/actual values and readback errors in themeVerification, then check current app settings before repeating an upload or recreating the app.',
     navigation_not_persisted: 'App navigation readback failed or did not match the requested settings. Navigation changes remain unverified. Inspect the expected values, actual values and readback error in navigationVerification, then check the current app settings.',
-    usage: 'openyida update-app <appType> [--name "New Name"] [--theme-file ./theme.css] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape]',
+    usage: 'openyida update-app <appType> [--name "New Name"] [--theme-file ./theme.css] [--confirm-legacy-app-style] [--disable-custom-theme] [--nav-theme light|dark|white|gray] [--logo-source appIcon|customImage] [--layout side|top|l_shape]',
     example: 'openyida update-app APP_XXX --theme-file ./app-theme.css --nav-theme light --logo-source appIcon --layout side',
-    options: 'Options:\n  --name, -n      App name (specify at least one update field)\n  --desc, -d      App description\n  --icon          Icon name (e.g. xian-yingyong)\n  --icon-color    Icon color (default: #0089FF)\n  --colour, --theme  podBlue | podGreen | podOrange | deepBlue | teal | black | custom ...\n  --theme-color   Update the app primary color; the CSS primary color takes precedence when a theme file is supplied\n  --theme-file    Custom app theme CSS file (up to 20 MB; must declare --color-brand1-6)\n  --nav-theme     Navigation theme: light, dark, white, or gray\n  --logo-source   Navigation logo source: appIcon or customImage\n  --layout        Modern navigation layout: side, top, or l_shape\n  --hide-app-nav  Hide app navigation in visit mode, only for custom pages with self-rendered top/side navigation\n  --show-app-nav  Restore app navigation in visit mode',
+    options: 'Options:\n  --name, -n      App name (specify at least one update field)\n  --desc, -d      App description\n  --icon          Icon name (e.g. xian-yingyong)\n  --icon-color    Icon color (default: #0089FF)\n  --colour, --theme  podBlue | podGreen | podOrange | deepBlue | teal | black | custom ...\n  --theme-color   Update the app primary color; the CSS primary color takes precedence when a theme file is supplied\n  --theme-file    Custom app theme CSS file (up to 20 MB; must declare --color-brand1-6)\n  --nav-theme     Navigation theme: light, dark, white, or gray\n  --logo-source   Navigation logo source: appIcon or customImage\n  --layout        Modern navigation layout: side, top, or l_shape\n  --hide-app-nav  Hide app navigation in visit mode, only for custom pages with self-rendered top/side navigation\n  --show-app-nav  Restore app navigation in visit mode\n  --confirm-legacy-app-style  Allow legacy app CSS only after human approval\n  --disable-custom-theme  Disable application CSS, retain resource URL and primary color',
     missing_app_type: 'Error: missing appType argument',
-    missing_update_field: 'Error: at least one update field must be specified (--name, --desc, --icon, --theme, --theme-color, --theme-file, --nav-theme, --logo-source, --layout, --hide-app-nav, --show-app-nav)',
+    missing_update_field: 'Error: at least one update field must be specified (--name, --desc, --icon, --theme, --theme-color, --theme-file, --nav-theme, --logo-source, --layout, --hide-app-nav, --show-app-nav, --disable-custom-theme)',
     title: '  update-app - Yida App Info Update Tool',
     app_type: '\n  App ID:       {0}',
     new_name: '  New name:     {0}',
@@ -2169,7 +2173,7 @@ module.exports.upgrade_app_theme = {
   prepare_blocked: 'Some schemas or sources could not be retrieved or require manual migration. Inspect upgrade-plan.json; remote resources were not modified.',
 
   context_failed: 'Cannot verify the server context for this app and organization. Upgrade stopped.',
-  ai_only: 'This app does not currently support upgrading to the new theme.',
+  ai_only: 'This operation is unavailable for this app.',
   usage: 'openyida upgrade-app-theme <appType> --explicit-request [--confirm | --prepare --output-dir <dir>] [--json]',
   confirm_required: 'Requires an explicit upgrade request and ask_human approval of the upgrade scope. Both --explicit-request and --confirm are required.',
   read_failed: 'Cannot read theme upgrade configuration. Complete upgrade status is unverified.',