openyida 2026.7.30 → 2026.8.3

package/lib/app/generate-page.js

@@ -101,7 +101,80 @@ const TEMPLATES = {
   },
 };
 
+const SAMPLE_RESIDUE_TOKENS = {
+  'official-homepage': [
+    'Luma Roast',
+    'Luma',
+    'coffee',
+    'Coffee',
+    '豆单',
+    '烘焙',
+    '冷萃',
+    '手冲',
+    '吧台',
+    '杯测',
+    '生豆',
+    '门店',
+    '订阅',
+    'Shanghai',
+    'Seasonal roast',
+    'Visit Luma',
+    'oy-coffee',
+    'COFFEE_',
+  ],
+  'product-homepage': [
+    '演示预约正在同步到客户表单',
+    '线索表单、产品演示和客户回访',
+  ],
+  'workbench-home': [
+    '清理高优先级待办',
+    '核对客户回访结果',
+    '同步异常与负责人',
+  ],
+  'business-list': [
+    'SO-240716',
+    'PRJ-240716',
+    'CL-240717',
+  ],
+  'detail-profile': [
+    '采购负责人李青',
+    '苏州仓库存',
+  ],
+  'portal-shell-home': [
+    'Red Portal Shell',
+  ],
+};
+
+function normalizeSearchText(value) {
+  return String(value || '').toLowerCase();
+}
+
+function collectTextDeep(value, output) {
+  if (value === undefined || value === null) {
+    return output;
+  }
+  if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+    output.push(String(value));
+    return output;
+  }
+  if (Array.isArray(value)) {
+    value.forEach((item) => collectTextDeep(item, output));
+    return output;
+  }
+  if (typeof value === 'object') {
+    Object.keys(value).forEach((key) => collectTextDeep(value[key], output));
+  }
+  return output;
+}
+
 function collectSpecText(spec) {
+  if (!spec || typeof spec !== 'object') {
+    return '';
+  }
+  return collectTextDeep(spec, []).join(' ');
+}
+
+function collectRoutingText(spec) {
   if (!spec || typeof spec !== 'object') {
     return '';
   }
@@ -130,6 +203,43 @@ function collectSpecText(spec) {
     .join(' ');
 }
 
+function stripFallbackSource(source) {
+  return String(source || '')
+    .replace(/'data:image\/[^']*'/g, "''")
+    .replace(/"data:image\/[^"]*"/g, '""')
+    .replace(/const\s+[A-Z0-9_]*IMAGE\s*=\s*['"][\s\S]*?['"];\n/g, '')
+    .replace(/applyPageFallbacks\(\{[\s\S]*?\n\}\);\n/g, '')
+    .replace(/const\s+DEFAULT_[A-Z0-9_]+\s*=\s*[\s\S]*?;\n/g, '');
+}
+
+function findSampleResidues(source, templateName, spec) {
+  const tokens = SAMPLE_RESIDUE_TOKENS[templateName] || [];
+  if (!tokens.length) {
+    return [];
+  }
+  const searchableSource = normalizeSearchText(stripFallbackSource(source));
+  const specText = normalizeSearchText(collectSpecText(spec || {}));
+  const residues = tokens.filter((token) => {
+    const normalizedToken = normalizeSearchText(token);
+    return searchableSource.includes(normalizedToken) && !specText.includes(normalizedToken);
+  });
+  return Array.from(new Set(residues));
+}
+
+function assertNoSampleResidueInDomainReadyOutput(source, templateName, spec, ir) {
+  const fidelity = ir && ir.domainFidelity;
+  if (!fidelity || fidelity.status !== 'domain-ready') {
+    return;
+  }
+  const residues = findSampleResidues(source, templateName, spec);
+  if (!residues.length) {
+    return;
+  }
+  fidelity.status = 'draft-needs-domain-spec';
+  fidelity.sampleFallbacks = Array.from(new Set([...(fidelity.sampleFallbacks || []), ...residues.map((item) => `source:${item}`)]));
+  throwCommandError(`生成页仍残留 sample 内容，已停止写入/发布：${residues.join(', ')}。请把这些文案、行业词、配图说明或样式命名替换为当前业务自己的内容。`);
+}
+
 function inferTemplateName(options, spec) {
   if (options.template) {
     return options.template;
@@ -138,7 +248,7 @@ function inferTemplateName(options, spec) {
     return spec.template;
   }
 
-  const text = collectSpecText(spec);
+  const text = collectRoutingText(spec);
   if (/数据大屏|大屏|实时监控|预警系统|态势|指挥舱|监测预警|screen/i.test(text)) {
     return 'data-screen';
   }
@@ -484,7 +594,7 @@ function reportNavigationConfig(ir) {
   if (!blueprint || blueprint.renderNav !== false) {
     return;
   }
-  hint('检测到页面内应用导航或沉浸式页面，发布后应设置 isRenderNav=false：openyida update-form-config <appType> <formUuid> false "<页面标题>"');
+  hint('检测到显式隐藏平台导航，发布后应设置 isRenderNav=false：openyida update-form-config <appType> <formUuid> false "<页面标题>"');
 }
 
 function ensureOutputDir(outputPath) {
@@ -604,6 +714,7 @@ async function run(args) {
     artifact: outputPath,
     code: 'OPENYIDA_GENERATED_PAGE_EMOJI_FORBIDDEN',
   });
+  assertNoSampleResidueInDomainReadyOutput(outputSource, templateName, spec, ir);
 
   ensureOutputDir(outputPath);
   fs.writeFileSync(outputPath, outputSource, 'utf-8');
@@ -636,6 +747,10 @@ async function run(args) {
       ['Archetype', ir.archetype],
       ['Visual profile', ir.visualProfile && ir.visualProfile.name],
       ['Theme profile', ir.themeProfile && ir.themeProfile.name],
+      ['Theme source', ir.themeProfile && ir.themeProfile.themeColorSource],
+      ['Theme color', ir.themeProfile && ir.themeProfile.themeColor],
+      ['Nav theme', ir.themeProfile && (ir.themeProfile.navTheme || 'light')],
+      ['Theme color mode', ir.themeProfile && ir.themeProfile.colorMode],
       ['Theme scope', ir.themeScope],
       ['Yida nav', ir.appBlueprint && ir.appBlueprint.renderNav === false ? 'hide (isRenderNav=false)' : 'render'],
       ['Imported modules', importedModules.join(', ')],
@@ -676,6 +791,10 @@ async function run(args) {
       ['Archetype', ir.archetype],
       ['Visual profile', ir.visualProfile && ir.visualProfile.name],
       ['Theme profile', ir.themeProfile && ir.themeProfile.name],
+      ['Theme source', ir.themeProfile && ir.themeProfile.themeColorSource],
+      ['Theme color', ir.themeProfile && ir.themeProfile.themeColor],
+      ['Nav theme', ir.themeProfile && (ir.themeProfile.navTheme || 'light')],
+      ['Theme color mode', ir.themeProfile && ir.themeProfile.colorMode],
       ['Theme scope', ir.themeScope],
       ['Yida nav', ir.appBlueprint && ir.appBlueprint.renderNav === false ? 'hide (isRenderNav=false)' : 'render'],
       ['Blocks', ir.blocks.map((block) => block.type).join(', ')],
@@ -695,4 +814,6 @@ module.exports = {
   normalizeOutputPathForProjectCwd,
   inferMode,
   inferTemplateName,
+  findSampleResidues,
+  assertNoSampleResidueInDomainReadyOutput,
 };

package/lib/app/nav-group.js

@@ -347,6 +347,81 @@ function reorderRootNodes(list, values) {
   };
 }
 
+function normalizeComparableText(value) {
+  return String(value || '').trim().toLowerCase();
+}
+
+function getNavigationPriority(node) {
+  const name = normalizeComparableText(getNodeName(node));
+  const formType = normalizeComparableText(node.formType);
+  const navType = normalizeComparableText(node.navType);
+
+  if (navType === 'system') {
+    return 99;
+  }
+
+  if (/门户|首页|主页|工作台|入口|总览|概览|home|homepage|portal|workspace|overview/.test(name)) {
+    return 0;
+  }
+
+  if (formType === 'display') {
+    return 1;
+  }
+
+  if (formType === 'process') {
+    return 2;
+  }
+
+  if (['receipt', 'form'].includes(formType)) {
+    return 3;
+  }
+
+  if (navType === 'nav') {
+    return 4;
+  }
+
+  return 5;
+}
+
+function compareNavigationNodes(a, b) {
+  const priorityDiff = getNavigationPriority(a) - getNavigationPriority(b);
+  if (priorityDiff !== 0) {
+    return priorityDiff;
+  }
+
+  const orderA = Number.isFinite(Number(a.listOrder)) ? Number(a.listOrder) : Number.MAX_SAFE_INTEGER;
+  const orderB = Number.isFinite(Number(b.listOrder)) ? Number(b.listOrder) : Number.MAX_SAFE_INTEGER;
+  if (orderA !== orderB) {
+    return orderA - orderB;
+  }
+
+  return String(a.id || a.navUuid || '').localeCompare(String(b.id || b.navUuid || ''));
+}
+
+function autoOrderRootNodes(list) {
+  const { roots } = buildMutableForest(list);
+  const systemRoots = roots.filter((node) => node.navType === 'SYSTEM');
+  const sortableRoots = roots
+    .filter((node) => node.navType !== 'SYSTEM')
+    .slice()
+    .sort(compareNavigationNodes);
+
+  const orderedRoots = systemRoots.concat(sortableRoots);
+
+  return {
+    roots: orderedRoots,
+    ids: flattenTreeIds(orderedRoots),
+    orderedNavUuids: sortableRoots.map((node) => node.navUuid),
+    orderedNodes: sortableRoots.map((node) => ({
+      navUuid: node.navUuid,
+      formUuid: node.formUuid || null,
+      name: getNodeName(node),
+      formType: node.formType || '',
+      priority: getNavigationPriority(node),
+    })),
+  };
+}
+
 function countChildren(list, navUuid) {
   return (list || []).filter((node) => node.parentNavUuid === navUuid).length;
 }
@@ -595,6 +670,41 @@ async function orderRootNodes(appType, values, authRef) {
   };
 }
 
+async function autoOrderNavigation(appType, authRef) {
+  const list = await fetchNavigationList(appType, authRef);
+  const ordered = autoOrderRootNodes(list);
+  if (!ordered.orderedNavUuids.length) {
+    return {
+      success: true,
+      appType,
+      action: 'auto-order',
+      targetParentNavUuid: ROOT_NAV_UUID,
+      orderedNavUuids: [],
+      orderedNodes: [],
+      skipped: true,
+    };
+  }
+
+  const firstNode = resolveNode(list, ordered.orderedNavUuids[0], { excludeSystem: true });
+  await postNavAction(appType, 'updateOrderNew', {
+    currentId: firstNode.id,
+    parentNavUuid: ROOT_NAV_UUID,
+    navType: firstNode.navType,
+    ids: ordered.ids.join(','),
+  }, authRef);
+
+  const updatedList = await fetchNavigationList(appType, authRef);
+  const updatedOrdered = autoOrderRootNodes(updatedList);
+  return {
+    success: true,
+    appType,
+    action: 'auto-order',
+    targetParentNavUuid: ROOT_NAV_UUID,
+    orderedNavUuids: updatedOrdered.orderedNavUuids,
+    orderedNodes: updatedOrdered.orderedNodes,
+  };
+}
+
 async function setVisibility(appType, value, hidden, authRef) {
   if (!value) {
     throw new Error('Usage: openyida nav-group <hide|show> <appType> <navUuid|formUuid|name>');
@@ -630,6 +740,7 @@ Usage:
   openyida nav-group delete <appType> <groupNavUuid|groupName> [--force]
   openyida nav-group move <appType> <navUuid|formUuid|name> --to <groupNavUuid|groupName|root> [--before <node>] [--after <node>]
   openyida nav-group order <appType> <navUuid|formUuid|name> [more items...]
+  openyida nav-group auto-order <appType>
   openyida nav-group hide <appType> <navUuid|formUuid|name>
   openyida nav-group show <appType> <navUuid|formUuid|name>
 `);
@@ -664,6 +775,8 @@ async function run(args) {
     result = await moveNode(appType, positional[1], flags, authRef);
   } else if (subCommand === 'order' || subCommand === 'reorder') {
     result = await orderRootNodes(appType, positional.slice(1), authRef);
+  } else if (subCommand === 'auto-order' || subCommand === 'autoorder' || subCommand === 'sort') {
+    result = await autoOrderNavigation(appType, authRef);
   } else if (subCommand === 'hide') {
     result = await setVisibility(appType, positional[1], true, authRef);
   } else if (subCommand === 'show') {
@@ -677,10 +790,14 @@ async function run(args) {
 
 module.exports = {
   ROOT_NAV_UUID,
+  autoOrderNavigation,
+  autoOrderRootNodes,
   buildI18nTitle,
   buildNavigationTree,
+  compareNavigationNodes,
   flattenTreeIds,
   flattenTreeNodes,
+  getNavigationPriority,
   moveNodeInTree,
   normalizeNavNode,
   orderRootNodes,

package/lib/app/page-ir.js

@@ -1,5 +1,11 @@
 'use strict';
 
+const {
+  APP_THEME_TOKEN_PRESETS,
+  APP_THEME_TOKEN_PRESET_KEYS,
+  isPresetThemeKey,
+} = require('./theme-presets');
+
 const IR_VERSION = '1.0';
 
 const PRODUCT_HOMEPAGE_TEMPLATE = 'product-homepage';
@@ -16,6 +22,7 @@ const TODO_MVC_TEMPLATE = 'todo-mvc';
 const PAGE_SCENES = ['workbench', 'dashboard', 'list', 'detail', 'landing', 'screen'];
 const THEME_SCOPES = ['page', 'app'];
 const RESEARCH_LEVELS = ['none', 'light', 'enhanced', 'deep'];
+const DEFAULT_THEME_PROFILE_KEY = 'podBlue';
 
 const CANVAS_CONTROL_RESET_CSS = `
           :where(.oy-page, .oy-workbench-home, .oy-dashboard-overview, .oy-business-list, .oy-data-management, .oy-detail-profile, .oy-split-pane-detail, .oy-portal-shell-home, .oy-official, .oy-screen, .oy-todo-os, .oy-native-portal, .oy-smoke-page) {
@@ -128,30 +135,19 @@ const DEFAULT_VISUAL_PROFILES = {
   },
   screen: {
     name: 'yida-app-theme',
-    tone: 'immersive-command',
+    tone: 'light-command',
     density: 'screen-dense',
-    neutral: 'dark-blue',
+    neutral: 'light-blue-gray',
     corner: 'layered',
-    accent: 'glow-brand',
+    accent: 'brand-signal',
     typography: 'tabular-numeric',
     motif: ['command-map', 'glow-kpi', 'radar-panel', 'rank-feed'],
   },
 };
 
+// Application theme token profiles work as the default page-level theme suggestions.
+// Only platform-supported theme keys are mirrored into appThemeKey.
 const DEFAULT_THEME_PROFILES = {
-  'yida-pod-business': {
-    name: 'yida-app-theme',
-    followRuntimeTheme: true,
-    themeColorSource: 'runtime-css-vars',
-    themeColor: '#6B7CAB',
-    themeColorDeep: '#435480',
-    themeColorSoft: '#F3F5FB',
-    themeColorTint: 'rgba(107, 124, 171, 0.2)',
-    navTheme: 'light',
-    mode: 'color_color',
-    colorMode: 'gradient',
-    mobileNavStyle: 'top',
-  },
   'yida-app-theme': {
     name: 'yida-app-theme',
     followRuntimeTheme: true,
@@ -167,18 +163,36 @@ const DEFAULT_THEME_PROFILES = {
   },
 };
 
-const VISUAL_NEUTRAL_ALIASES = {
-  'pod-blue-gray': 'yida-blue-gray',
-};
+function registerTokenThemeProfiles(presetKeys, tokenPresets, options = {}) {
+  presetKeys.forEach((presetName) => {
+    const tokens = tokenPresets[presetName];
+    DEFAULT_THEME_PROFILES[presetName] = {
+      name: presetName,
+      appThemeKey: options.appThemeKeyFor ? options.appThemeKeyFor(presetName) : (options.appThemeKey === false ? '' : presetName),
+      followRuntimeTheme: false,
+      themeColorSource: options.themeColorSource || 'theme-token-preset',
+      themeColor: tokens['--color-brand1-6'],
+      themeColorDeep: tokens['--color-brand1-9'],
+      themeColorSoft: tokens['--color-brand1-2'],
+      themeColorTint: tokens['--color-brand1-3'],
+      navTheme: 'light',
+      mode: 'color_color',
+      colorMode: 'gradient',
+      mobileNavStyle: 'top',
+    };
+  });
+}
 
-const VISUAL_CORNER_ALIASES = {
-  'pod-layered': 'layered',
-};
+registerTokenThemeProfiles(APP_THEME_TOKEN_PRESET_KEYS, APP_THEME_TOKEN_PRESETS, {
+  themeColorSource: 'application-theme',
+  appThemeKeyFor: (presetName) => (isPresetThemeKey(presetName) ? presetName : ''),
+});
 
-const VISUAL_MOTIF_ALIASES = {
-  'pod-shell': 'app-shell',
-  'pod-panel': 'app-panel',
-};
+const VISUAL_NEUTRAL_ALIASES = {};
+
+const VISUAL_CORNER_ALIASES = {};
+
+const VISUAL_MOTIF_ALIASES = {};
 
 const DEFAULT_PRODUCT_HOMEPAGE = {
   meta: {
@@ -707,7 +721,7 @@ function getThemeProfileInput(spec) {
 }
 
 function normalizeThemeProfile(rawProfile) {
-  const defaults = DEFAULT_THEME_PROFILES['yida-app-theme'];
+  const defaults = DEFAULT_THEME_PROFILES[DEFAULT_THEME_PROFILE_KEY];
   const profile = typeof rawProfile === 'string'
     ? { name: rawProfile }
     : isPlainObject(rawProfile)
@@ -716,7 +730,8 @@ function normalizeThemeProfile(rawProfile) {
 
   const name = valueOrDefault(profile.name || profile.profile, defaults.name);
   const preset = DEFAULT_THEME_PROFILES[name] || defaults;
-  const normalizedName = DEFAULT_THEME_PROFILES[name] ? preset.name : name;
+  const isKnownProfile = Boolean(DEFAULT_THEME_PROFILES[name]);
+  const normalizedName = isKnownProfile ? preset.name : name;
   const hasExplicit = (...keys) => keys.some((key) => (
     Object.prototype.hasOwnProperty.call(profile, key)
     && profile[key] !== undefined
@@ -732,10 +747,15 @@ function normalizeThemeProfile(rawProfile) {
     ? Boolean(preset.followRuntimeTheme && !hasExplicitColorFamily)
     : profile.followRuntimeTheme !== false;
 
-  return {
+  const normalized = {
     name: normalizedName,
     followRuntimeTheme,
-    themeColorSource: followRuntimeTheme ? 'runtime-css-vars' : 'profile',
+    themeColorSource: followRuntimeTheme
+      ? 'runtime-css-vars'
+      : valueOrDefault(
+        profile.themeColorSource || profile.colorSource,
+        hasExplicitColorFamily ? 'profile' : (preset.themeColorSource || 'profile')
+      ),
     themeColor: valueOrDefault(profile.themeColor || profile.color || profile.brandColor, preset.themeColor),
     themeColorDeep: valueOrDefault(profile.themeColorDeep || profile.brandDeep, preset.themeColorDeep),
     themeColorSoft: valueOrDefault(profile.themeColorSoft || profile.brandSoft, preset.themeColorSoft),
@@ -745,6 +765,13 @@ function normalizeThemeProfile(rawProfile) {
     colorMode: valueOrDefault(profile.colorMode, preset.colorMode),
     mobileNavStyle: valueOrDefault(profile.mobileNavStyle, preset.mobileNavStyle),
   };
+
+  const appThemeKey = valueOrDefault(profile.appThemeKey || profile.themeKey, isKnownProfile ? preset.appThemeKey : '');
+  if (appThemeKey) {
+    normalized.appThemeKey = appThemeKey;
+  }
+
+  return normalized;
 }
 
 function getThemeScopeInput(spec) {
@@ -920,10 +947,10 @@ function inferPageLevelNavigation(templateName, source) {
   if (explicit !== null) {
     return explicit;
   }
-  return ['portal-shell-home', 'workbench-home'].includes(templateName);
+  return false;
 }
 
-function inferHideAppNav(source, scene, templateName, hasPageNavigation) {
+function inferHideAppNav(source) {
   const explicitHide = normalizeOptionalBoolean(
     firstDefined(
       source.hideAppNav,
@@ -948,10 +975,7 @@ function inferHideAppNav(source, scene, templateName, hasPageNavigation) {
     return !explicitRender;
   }
 
-  if (scene === 'screen' || templateName === 'data-screen') {
-    return true;
-  }
-  return hasPageNavigation;
+  return false;
 }
 
 function normalizeAppBlueprint(spec, scene, templateName, meta) {
@@ -966,7 +990,7 @@ function normalizeAppBlueprint(spec, scene, templateName, meta) {
   const shell = valueOrDefault(source.shell || source.shellType || spec.shell || spec.shellType, scene === 'screen' ? 'no_shell' : 'single_page');
   const navigation = normalizeStringList(source.navigation || source.navGroups || spec.navigation || spec.navGroups);
   const hasPageNavigation = inferPageLevelNavigation(templateName, source);
-  const hideAppNav = inferHideAppNav(source, scene, templateName, hasPageNavigation);
+  const hideAppNav = inferHideAppNav(source);
   const renderNav = !hideAppNav;
   const defaultPage = {
     name: meta && (meta.brandName || meta.title) ? (meta.brandName || meta.title) : templateName,
@@ -988,7 +1012,7 @@ function normalizeAppBlueprint(spec, scene, templateName, meta) {
     navConfig: {
       isRenderNav: renderNav,
       reason: hideAppNav
-        ? 'page-level navigation or immersive page should own the viewport'
+        ? 'explicit hide navigation request'
         : 'use Yida application navigation',
     },
   };
@@ -1159,6 +1183,8 @@ function normalizeMediaAssets(spec, defaults) {
   return {
     heroImage: valueOrDefault(source.heroImage || source.hero || spec.heroImage || spec.hero_image, fallback.heroImage || ''),
     heroImageAlt: valueOrDefault(source.heroImageAlt || source.heroAlt || spec.heroImageAlt || spec.hero_image_alt, fallback.heroImageAlt || ''),
+    storyImage: valueOrDefault(source.storyImage || source.story || spec.storyImage || spec.story_image, fallback.storyImage || ''),
+    storyImageAlt: valueOrDefault(source.storyImageAlt || source.storyAlt || spec.storyImageAlt || spec.story_image_alt, fallback.storyImageAlt || ''),
     productImages: productImages.length ? productImages : clone(fallback.productImages || []),
     materialStrategy: valueOrDefault(source.materialStrategy || spec.materialStrategy, fallback.materialStrategy || 'visual-anchor-required'),
     // 素材完成度：final(可交付最终版) / draft(仅草稿) / none(无素材) / unknown(尚未预检)

package/lib/app/publish.js

@@ -97,8 +97,9 @@ function parseArgs(argv = process.argv.slice(2)) {
   const compat = args.includes('--compat') || args.includes('--modern');
   const force = args.includes('--force');
   const canvas = args.includes('--canvas');
+  const autoNavOrder = args.includes('--auto-nav-order');
   const help = args.includes('--help') || args.includes('-h');
-  const filteredArgs = args.filter(arg => arg !== '--skip-lint' && arg !== '--health-check' && arg !== '--check' && arg !== '--compat' && arg !== '--modern' && arg !== '--force' && arg !== '--canvas' && arg !== '--json' && arg !== '--help' && arg !== '-h');
+  const filteredArgs = args.filter(arg => arg !== '--skip-lint' && arg !== '--health-check' && arg !== '--check' && arg !== '--compat' && arg !== '--modern' && arg !== '--force' && arg !== '--canvas' && arg !== '--auto-nav-order' && arg !== '--json' && arg !== '--help' && arg !== '-h');
 
   if (help) {
     usage(t('publish.usage'), t('publish.example'));
@@ -119,6 +120,7 @@ function parseArgs(argv = process.argv.slice(2)) {
     compat,
     force,
     canvas,
+    autoNavOrder,
     browserOpenMode: openOption.mode,
   };
 }
@@ -735,7 +737,7 @@ async function runMain(argv) {
   if (options.help) {
     return options;
   }
-  const { appType, formUuid, sourceFile, skipLint, healthCheck, compat, force, canvas: canvasFlag, browserOpenMode } = options;
+  const { appType, formUuid, sourceFile, skipLint, healthCheck, compat, force, canvas: canvasFlag, autoNavOrder, browserOpenMode } = options;
 
   let sourcePath = path.resolve(sourceFile);
   if (!fs.existsSync(sourcePath)) {
@@ -876,6 +878,8 @@ async function runMain(argv) {
 
   const pageUrl = `${baseUrl}/${appType}/workbench/${savedFormUuid}`;
   let healthCheckResult = null;
+  let navOrderResult = null;
+  let navOrderWarning = null;
   if (healthCheck) {
     step(5, t('publish.step_health_check'));
     try {
@@ -894,6 +898,23 @@ async function runMain(argv) {
     }
   }
 
+  if (autoNavOrder) {
+    step(healthCheck ? 6 : 5, t('publish.step_nav_order'));
+    try {
+      const { autoOrderNavigation } = require('./nav-group');
+      navOrderResult = await autoOrderNavigation(appType, authRef);
+      const orderedNames = (navOrderResult.orderedNodes || [])
+        .slice(0, 6)
+        .map((node) => node.name || node.formUuid || node.navUuid)
+        .filter(Boolean)
+        .join(' > ');
+      success(t('publish.nav_order_ok', orderedNames || '-'));
+    } catch (navOrderError) {
+      navOrderWarning = navOrderError && navOrderError.message ? navOrderError.message : t('common.unknown_error');
+      warn(t('publish.nav_order_failed', navOrderWarning));
+    }
+  }
+
   if (configResponse && configResponse.success) {
     result(true, t('publish.success'), [
       ['Form UUID', savedFormUuid],
@@ -901,7 +922,7 @@ async function runMain(argv) {
       ['URL', pageUrl],
     ]);
     console.log(JSON.stringify(withBrowserHandoff(
-      { success: true, appType, formUuid: savedFormUuid, version, url: pageUrl, healthCheck: healthCheckResult },
+      { success: true, appType, formUuid: savedFormUuid, version, url: pageUrl, healthCheck: healthCheckResult, navOrder: navOrderResult, navOrderWarning },
       pageUrl,
       { stage: 'publish_page_success', title: savedFormUuid },
       browserOpenMode
@@ -915,7 +936,7 @@ async function runMain(argv) {
     ]);
     hint(t('publish.schema_ok_config_failed'));
     console.log(JSON.stringify(withBrowserHandoff(
-      { success: true, appType, formUuid: savedFormUuid, version, url: pageUrl, configWarning: configErrorMsg, healthCheck: healthCheckResult },
+      { success: true, appType, formUuid: savedFormUuid, version, url: pageUrl, configWarning: configErrorMsg, healthCheck: healthCheckResult, navOrder: navOrderResult, navOrderWarning },
       pageUrl,
       { stage: 'publish_page_success', title: savedFormUuid },
       browserOpenMode