openyida 2026.9.23-beta.1 → 2026.9.23

package/README.md

@@ -74,13 +74,6 @@ openyida login
 
 OpenYida login defaults to OAuth token mode. It opens the DingTalk OAuth authorization page, receives the local loopback callback, exchanges `code` / `authCode` with the Yida server, and stores `access_token` / `refresh_token` in the user auth store when available. If the user auth store is not writable, OpenYida explicitly falls back to the current project cache and reports that narrower persistence scope.
 
-In a sandbox, headless shell, or CI dashboard where the loopback callback cannot complete, use the device authorization flow. Open the displayed verification URL on any device and enter the user code. `--env-hint` optionally pins the intended environment profile at authorization time:
-
-```bash
-openyida login --device
-openyida login --device --env-hint pre
-```
-
 When the user names a target Yida entry URL, pass it to the login command so OpenYida can select the matching environment and auth profile. For example:
 
 ```bash
@@ -390,7 +383,7 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 
 | Command | Description |
 |---------|-------------|
-| `openyida login [target-url] [--env <name>\|--intl\|--overseas\|--global\|--yidaapps\|--alibaba] [--client-id <clientId>] [--endpoint <url>] [--no-browser] [--device] [--env-hint <name>]` | Login with OAuth token mode |
+| `openyida login [target-url] [--env <name>\|--intl\|--overseas\|--global\|--yidaapps\|--alibaba] [--client-id <clientId>] [--endpoint <url>] [--no-browser]` | Login with OAuth token mode |
 | `openyida logout` | Logout / unbind current project auth |
 | `openyida auth <status\|login\|refresh\|logout\|profiles\|profile switch>` | Token login state and profile management |
 | `openyida org <list\|switch> [--json] [--corp-id <corpId>]` | Organization management (list / switch existing profiles first) |
@@ -401,7 +394,7 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 | Command | Description |
 |---------|-------------|
 | `openyida app-entry get <appType> [--json]` | Read frontend and management runtime entries |
-| `openyida app-entry set <appType> [--frontend <url>] [--management <url>] [--clear-frontend] [--clear-management] [--json]` | Register application entries with partial update and readback |
+| `openyida app-entry set <appType> [--frontend <url>\|--frontend-page <formUuid>] [--management <url>\|--management-page <formUuid>] [--clear-frontend] [--clear-management] [--json]` | Register application entries with partial update and readback |
 | `openyida app-list [--type managed\|created] [--page N] [--size N]` | Page through apps I manage or created |
 | `openyida corp-efficiency [overview\|details\|detail\|groups\|notify] [options] [--open\|--no-open]` | Query enterprise efficiency overview and detail reports |
 | `openyida create-app "<name>"\|--name <name> [options] [--locale zh_CN\|en_US\|ja_JP] [--open\|--no-open]` | Create a Yida app |
@@ -444,8 +437,8 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 | `openyida create-page <appType> "<name>" [--mode dashboard] [--hide-nav] [--locale zh_CN\|en_US\|ja_JP] [--open\|--no-open]` | Create a custom display page |
 | `openyida build-page <sourceFile> [--output file\|--write]` | Build Yida-compatible page source |
 | `openyida check-page <src> [--compat] [--json]` | Check custom page standards |
-| `openyida compile <src> [--canvas] [--compat] [--skip-lint] [--json]` | Compile custom page locally |
-| `openyida publish <src> <appType> <formUuid> [--health-check] [--force] [--canvas] [--compat] [--skip-lint] [--auto-nav-order] [--open\|--no-open] [--json]` | Compile and publish custom page |
+| `openyida compile <src> [--canvas] [--compat] [--skip-lint] [--strict-theme\|--allow-fixed-brand] [--json]` | Compile custom page locally |
+| `openyida publish <src> <appType> <formUuid> [--health-check] [--force] [--canvas] [--compat] [--skip-lint] [--fix-theme] [--strict-theme] [--allow-fixed-brand] [--auto-nav-order] [--open\|--no-open] [--json]` | Compile and publish custom page |
 | `openyida update-form-config <appType> <formUuid> <true\|false\|keep> "<title>" [--locale zh_CN\|en_US\|ja_JP]` | Update form configuration |
 | `openyida get-form-config <appType> <formUuid> [--json]` | Query form configuration |
 

package/bin/yida.js

@@ -279,7 +279,6 @@ function getFirstPositionalArg(cliArgs, startIndex = 0) {
     '--login-url',
     '--profile',
     '--user-id',
-    '--env-hint',
   ]);
   for (let index = startIndex; index < cliArgs.length; index++) {
     const arg = cliArgs[index];
@@ -387,7 +386,6 @@ function applyLoginEnvironmentFlags(cliArgs, options = {}) {
     '--client-id',
     '--profile',
     '--user-id',
-    '--env-hint',
   ]);
   const targetUrlFlags = new Set([
     '--endpoint',
@@ -539,23 +537,13 @@ function printLoginHelp() {
 }
 
 function buildTokenLoginOptions(loginArgs) {
-  const device = loginArgs.includes('--device');
   return {
     clientId: getArgValue(loginArgs, '--client-id'),
     corpId: getArgValue(loginArgs, '--corp-id'),
     userId: getArgValue(loginArgs, '--user-id'),
     authProfile: getArgValue(loginArgs, '--profile'),
     quiet: process.env.YIDA_QUIET === '1' || loginArgs.includes('--quiet'),
-    noBrowser: device || loginArgs.includes('--no-browser'),
-    device,
-    envHint: getArgValue(loginArgs, '--env-hint'),
-    // Machine-readable progress events for agent runtimes (sandbox browsers,
-    // CI dashboards). Emits one JSON line per state transition.
-    onDeviceState: (state) => {
-      if (device) {
-        process.stdout.write(JSON.stringify({ type: 'device_login_state', ...state }) + '\n');
-      }
-    },
+    noBrowser: loginArgs.includes('--no-browser'),
   };
 }
 
@@ -1304,5 +1292,7 @@ main()
     } else {
       warn(t('cli.exec_failed', err.message));
     }
-    process.exit(err && err.exitCode ? err.exitCode : 1);
+    // Let pending stdout/stderr writes drain, especially large JSON diagnostics
+    // sent through pipes on macOS/Linux. process.exit() can truncate them.
+    process.exitCode = err && err.exitCode ? err.exitCode : 1;
   });

package/lib/app/app-entry.js

@@ -3,6 +3,7 @@
 const { createAuthRef, createYidaClient, unwrapYidaResponse } = require('../core/yida-client');
 const { t } = require('../core/i18n');
 const { throwUsage } = require('../core/command-errors');
+const { fetchFormPageList } = require('./form-navigation');
 
 /** Keep complete runtime URLs; the server verifies tenant and resource ownership. */
 function normalizeUrl(value, appType) {
@@ -42,6 +43,22 @@ function normalizeUrl(value, appType) {
   return input;
 }
 
+/** Resolve a page identifier into the canonical entry URL the platform expects. */
+async function resolveEntryUrl(authRef, appType, key, formUuid) {
+  if (!/^[A-Za-z0-9_-]+$/.test(String(formUuid || ''))) {
+    throw new Error(t('app_entry.invalid_url'));
+  }
+  const forms = await fetchFormPageList(appType, authRef);
+  const form = Array.isArray(forms) ? forms.find((item) => item.formUuid === formUuid) : null;
+  if (!form) { throw new Error(t('app_entry.page_not_in_app', formUuid)); }
+  if (key === 'frontend') {
+    if (String(form.formType).toLowerCase() !== 'display') { throw new Error(t('app_entry.frontend_display_required', formUuid)); }
+    if (!form.pathName) { throw new Error(t('app_entry.page_offline', formUuid)); }
+    return normalizeUrl(`${authRef.baseUrl}/${appType}/custom/${formUuid}`, appType);
+  }
+  return normalizeUrl(`${authRef.baseUrl}/${appType}/workbench/${formUuid}`, appType);
+}
+
 /** Reject duplicate or ambiguous flags; omissions never clear stored entries. */
 function parseArgs(args) {
   const [action, appType, ...flags] = args;
@@ -54,15 +71,17 @@ function parseArgs(args) {
     if (flag === '--json') {
       continue;
     }
-    const match = /^--(clear-)?(frontend|management)$/.exec(flag);
-    if (action !== 'set' || !match || Object.prototype.hasOwnProperty.call(values, match[2])) {
+    const match = /^--(clear-)?(frontend|management)(-page)?$/.exec(flag);
+    if (action !== 'set' || !match || (match[1] && match[3]) ||
+      Object.prototype.hasOwnProperty.call(values, match[2])) {
       throwUsage(t('app_entry.usage'));
     }
-    const value = match[1] ? null : flags[++index];
-    if (value !== null && (!value || value.startsWith('--'))) {
+    const kind = match[1] ? 'clear' : (match[3] ? 'page' : 'url');
+    const value = kind === 'clear' ? null : flags[++index];
+    if (kind !== 'clear' && (!value || value.startsWith('--'))) {
       throwUsage(t('app_entry.usage'));
     }
-    values[match[2]] = value;
+    values[match[2]] = { kind, value };
   }
   if (action === 'set' && !Object.keys(values).length) {
     throwUsage(t('app_entry.usage'));
@@ -90,8 +109,15 @@ async function run(args = []) {
   const authRef = createAuthRef();
   const client = createYidaClient({ authRef });
   const patch = {};
-  for (const [key, value] of Object.entries(values)) {
-    patch[key] = value === null ? null : { url: normalizeUrl(value, appType) };
+  for (const [key, spec] of Object.entries(values)) {
+    if (spec.kind === 'clear') {
+      patch[key] = null;
+    } else if (spec.kind === 'page') {
+      patch[key] = { url: await resolveEntryUrl(authRef, appType, key, spec.value) };
+    } else {
+      const url = normalizeUrl(spec.value, appType);
+      patch[key] = { url };
+    }
   }
   let result = await readEntries(client, appType);
   if (action === 'set') {
@@ -115,4 +141,4 @@ async function run(args = []) {
   return result;
 }
 
-module.exports = { run, parseArgs, normalizeUrl };
+module.exports = { run, parseArgs, normalizeUrl, resolveEntryUrl };

package/lib/app/application-style.js

@@ -13,8 +13,6 @@ const CREATIVE_TOKENS = [
   '--pod-page-footer-bg-color', '--pod-sticky-footer-box-shadow',
   '--oyd-content-width', '--oyd-content-padding', '--oyd-field-gap',
   '--oyd-heading-font', '--oyd-heading-size', '--oyd-rule-style',
-  '--pod-shell-theme-bg-color', '--pod-nav-item-text-color', '--pod-nav-item-text-hover-color',
-  '--pod-nav-item-text-selected-color', '--pod-nav-menu-bg-hover-color', '--pod-nav-menu-bg-selected-color',
 ];
 
 function validateCreativeDirection(direction, tokens) {

package/lib/app/canvas-compile.js

@@ -976,7 +976,12 @@ function compileCanvasLocal(source, options = {}) {
   assertCanvasNavigationStructure(source, options);
   assertCanvasNavigationPaths(source, options);
   assertInlineCssStructure(source, options);
-  assertCanvasThemeStructure(source, options);
+  const warnings = [];
+  assertCanvasThemeStructure(source, { ...options, onThemeWarning(message, details) {
+    warnings.push({ ...details, message });
+    if (options.onThemeWarning) { options.onThemeWarning(message, details); }
+    else { require('../core/chalk').warn(message); }
+  } });
 
   const importedModules = extractImportedModules(source);
 
@@ -1036,6 +1041,7 @@ function compileCanvasLocal(source, options = {}) {
   return {
     runtimeCode,
     importedModules: JSON.stringify(importedModules),
+    warnings,
   };
 }
 

package/lib/app/canvas-theme-guard.js

@@ -6,8 +6,7 @@ const { warn } = require('../core/chalk');
 const { t } = require('../core/i18n');
 
 // Whether provably fixed brand overrides should be downgraded from a hard
-// failure to a warning. Mirrors OPENYIDA_CANVAS_ALLOW_UNSUPPORTED_IMPORTS so
-// legacy pages can ship first and migrate to canvas-theme later.
+// failure to a warning while preserving the source override.
 function isTruthy(value) {
   return ['1', 'true', 'yes', 'on'].includes(String(value || '').trim().toLowerCase());
 }
@@ -17,14 +16,14 @@ function allowFixedBrand(options = {}, env = process.env) {
 }
 
 // Whether fixed brand overrides should hard-block publishing. Off by default so
-// users are never stuck: the guard warns and lets the app theme apply. Teams
+// the guard warns and retains fixed overrides. Teams
 // that want CI enforcement opt in via --strict-theme / OPENYIDA_CANVAS_STRICT_THEME.
 function strictFixedBrand(options = {}, env = process.env) {
   return options.strictBrand === true || isTruthy(env.OPENYIDA_CANVAS_STRICT_THEME);
 }
 
-function emitThemeWarning(options, message) {
-  if (typeof options.onThemeWarning === 'function') { options.onThemeWarning(message); return; }
+function emitThemeWarning(options, message, details) {
+  if (typeof options.onThemeWarning === 'function') { options.onThemeWarning(message, details); return; }
   warn(message);
 }
 
@@ -48,6 +47,10 @@ function assertCanvasThemeStructure(source, options = {}) {
   const traverse = Babel.packages.traverse.default || Babel.packages.traverse;
   assertBrandOverrides(ast, traverse, options);
   const functions = new Map();
+  const migrationSites = [];
+  const migrationEdges = [];
+  const migrationUses = options.requireThemeProvider
+    ? new Set(collectBrandOverrides(ast, traverse).map(item => item.usageStart)) : null;
   let program;
   let defaultExport;
   const fail = (kind, node) => {
@@ -89,6 +92,17 @@ function assertCanvasThemeStructure(source, options = {}) {
     return null;
   }
 
+  function insideProvider(p) {
+    let parent = p.isJSXOpeningElement() ? p.parentPath.parentPath : p.parentPath;
+    for (; parent && !parent.isFunction(); parent = parent.parentPath) {
+      if (parent.isJSXElement()) {
+        const component = resolveFunction(parent.get('openingElement.name'));
+        if (functions.get(component)?.name === 'CanvasThemeProvider') { return true; }
+      }
+    }
+    return false;
+  }
+
   traverse(ast, {
     CallExpression(p) {
       const owner = functions.get(p.getFunctionParent()?.node);
@@ -100,6 +114,9 @@ function assertCanvasThemeStructure(source, options = {}) {
       }
       if (!owner) { return; }
       if (target) { owner.calls.push(target); }
+      if (migrationUses && target) {
+        migrationEdges.push({ from: p.getFunctionParent().node, to: target, covered: insideProvider(p) });
+      }
       const callee = p.node.callee;
       if (callee.type === 'MemberExpression' && callee.object.name === 'React' && callee.property.name === 'createElement') {
         const component = resolveFunction(p.get('arguments.0'));
@@ -110,11 +127,19 @@ function assertCanvasThemeStructure(source, options = {}) {
       const owner = functions.get(p.getFunctionParent()?.node);
       const component = resolveFunction(p.get('name'));
       if (owner && component) { owner.renders.push(component); }
+      if (migrationUses) {
+        const from = p.getFunctionParent()?.node;
+        if (component && from) { migrationEdges.push({ from, to: component, covered: insideProvider(p) }); }
+        if (migrationUses.has(p.node.start)) { migrationSites.push({ owner: from, covered: insideProvider(p), node: p.node }); }
+      }
     },
   });
 
   const entry = resolveFunction(program.scope.getBinding('YidaComp')?.path) || resolveFunction(defaultExport);
-  if (!entry) { return; }
+  if (!entry) {
+    if (options.requireThemeProvider) { fail('provider_missing', defaultExport?.node); }
+    return;
+  }
 
   // Calling a hook before returning a Provider cannot read that Provider.
   const directSeen = new Set();
@@ -143,9 +168,27 @@ function assertCanvasThemeStructure(source, options = {}) {
   }
   visit(entry);
   const hasProvider = [...functions.values()].some(info => info.name === 'CanvasThemeProvider');
-  if (!providerMounted && (hasProvider || firstHook)) {
+  if (!providerMounted && (options.requireThemeProvider || hasProvider || firstHook)) {
     fail('provider_missing', firstHook || entry);
   }
+  if (migrationUses) {
+    // A sibling provider does not supply context to the migrated controls.
+    // Unknown/dynamic render paths are left for manual migration.
+    const checked = new Map();
+    const checkScope = (node, covered) => {
+      const states = checked.get(node) || new Set();
+      if (states.has(covered)) { return; }
+      states.add(covered); checked.set(node, states);
+      for (const site of migrationSites.filter(site => site.owner === node)) {
+        if (!covered && !site.covered) { fail('provider_missing', site.node); }
+      }
+      migrationEdges.filter(edge => edge.from === node).forEach(edge => checkScope(edge.to, covered || edge.covered));
+    };
+    checkScope(entry, false);
+    for (const site of migrationSites) {
+      if (!checked.has(site.owner)) { fail('provider_missing', site.node); }
+    }
+  }
 }
 
 // Collect every provably fixed brand color passed to antd's ConfigProvider.
@@ -154,6 +197,7 @@ function assertCanvasThemeStructure(source, options = {}) {
 // can surgically remove it while the guard reuses the same detection to fail.
 function collectBrandOverrides(ast, traverse) {
   const violations = [];
+  let usageStart;
   const resolve = (p, seen = new Set()) => {
     if (!p?.node || seen.has(p.node)) { return null; }
     seen.add(p.node);
@@ -178,7 +222,7 @@ function collectBrandOverrides(ast, traverse) {
     // Remove the override at its ConfigProvider usage site, not the resolved literal.
     const property = p?.parentPath?.isObjectProperty() ? p.parentPath.node : null;
     violations.push({
-      field, color, line,
+      field, color, line, usageStart,
       start: property ? property.start : val.node.start,
       end: property ? property.end : val.node.end,
     });
@@ -197,6 +241,7 @@ function collectBrandOverrides(ast, traverse) {
       if (!(imported.isImportSpecifier() && imported.node.imported.name === 'ConfigProvider')
         && !(imported.isImportNamespaceSpecifier() && name.node.property?.name === 'ConfigProvider')) { return; }
       const attribute = p.get('attributes').find(attr => attr.isJSXAttribute() && attr.node.name.name === 'theme');
+      usageStart = p.node.start;
       const theme = attribute?.get('value.expression');
       tokens(prop(theme, 'token'));
       const components = prop(theme, 'components');
@@ -213,19 +258,21 @@ function collectBrandOverrides(ast, traverse) {
 }
 
 // Fixed brand colors passed to antd's ConfigProvider are relaxed by default:
-// warn and continue so users are never blocked (the app theme still applies at
-// runtime). --strict-theme / OPENYIDA_CANVAS_STRICT_THEME restores the hard fail
-// for CI enforcement; --allow-fixed-brand keeps its explicit ship-as-is warning.
+// Warn and preserve the literal override; this does not install an app theme.
+// Strict mode blocks these overrides; allow-fixed-brand explicitly preserves them.
 function assertBrandOverrides(ast, traverse, options) {
   const explicitlyAllowed = allowFixedBrand(options);
   const strict = strictFixedBrand(options);
   for (const { field, color, line } of collectBrandOverrides(ast, traverse)) {
+    const details = { code: 'OPENYIDA_CANVAS_THEME_FIXED_BRAND', sourcePath: options.sourcePath || '',
+      line, field, value: color, themeConsistency: 'fixed_override',
+      nextAction: { type: 'review_theme_override', sample: 'openyida sample openyida-page-template canvas-theme' } };
     if (explicitlyAllowed) {
-      emitThemeWarning(options, t('publish.canvas_theme_fixed_brand_allowed', line, field));
+      emitThemeWarning(options, t('publish.canvas_theme_fixed_brand_allowed', line, field), details);
       continue;
     }
     if (!strict) {
-      emitThemeWarning(options, t('publish.canvas_theme_fixed_brand_relaxed', line, field));
+      emitThemeWarning(options, t('publish.canvas_theme_fixed_brand_relaxed', line, field), details);
       continue;
     }
     throw new CliError(t('publish.canvas_theme_fixed_brand', line), {

package/lib/app/compile.js

@@ -27,14 +27,18 @@ async function run(args) {
   const compat = args.includes('--compat') || args.includes('--modern');
   const canvas = args.includes('--canvas');
   const json = args.includes('--json');
+  const strictBrand = args.includes('--strict-theme');
+  const allowFixedBrand = args.includes('--allow-fixed-brand');
   const filteredArgs = args.filter(arg => ![
     '--skip-lint',
     '--compat',
     '--modern',
     '--canvas',
     '--json',
+    '--strict-theme',
+    '--allow-fixed-brand',
   ].includes(arg));
-  if (filteredArgs.length < 1) {
+  if (filteredArgs.length !== 1 || filteredArgs[0].startsWith('--') || (strictBrand && allowFixedBrand)) {
     throwUsage(t('cli.compile_usage'), t('cli.compile_example'), {
       code: 'COMPILE_INVALID_ARGUMENTS',
     });
@@ -51,7 +55,9 @@ async function run(args) {
     const workspaceRoot = process.cwd();
     const relativeSourcePath = path.relative(workspaceRoot, sourcePath);
     const loadedSource = loadPageSource(relativeSourcePath, { workspaceRoot });
-    const compiled = compileCanvasPageSource(loadedSource);
+    let compiled;
+    try { compiled = compileCanvasPageSource(loadedSource, { strictBrand, allowFixedBrand }); }
+    catch (error) { throw require('../core/source-repair').withSourceRepair(error, [sourcePath], args); }
     const payload = {
       ok: true,
       pageType: 'canvas',
@@ -61,6 +67,7 @@ async function run(args) {
       sourceHash: compiled.sourceHash,
       compiledHash: compiled.compiledHash,
       importedModules: JSON.parse(compiled.importedModules),
+      warnings: compiled.warnings,
     };
     if (json) {
       console.log(JSON.stringify(payload));
@@ -70,6 +77,9 @@ async function run(args) {
     return payload;
   }
 
+  if (strictBrand || allowFixedBrand) {
+    throwUsage(t('publish.theme_canvas_only'), undefined, { code: 'COMPILE_INVALID_ARGUMENTS' });
+  }
   const initialSourceCode = fs.readFileSync(sourcePath, 'utf-8');
   warnLargePageSource(initialSourceCode, sourcePath);
   if (shouldBuildPageSource(initialSourceCode, sourcePath, { modern: compat })) {

package/lib/app/custom-theme.js

@@ -6,17 +6,9 @@ const { getAccessToken } = require('../auth/token-auth');
 const { CliError } = require('../core/cli-error');
 const { t } = require('../core/i18n');
 const { findCssStructureIssue } = require('../core/css-structure');
+const { REQUIRED_BRAND_SCALE_TOKENS, REQUIRED_APPLICATION_BRAND_TOKENS, rootDeclarations, invalidBrandValues } = require('../core/theme-brand-scale');
 
 const MAX_THEME_FILE_BYTES = 20 * 1024 * 1024;
-const REQUIRED_BRAND_SCALE_TOKENS = Object.freeze([
-  '--color-brand1-1',
-  '--color-brand1-2',
-  '--color-brand1-3',
-  '--color-brand1-5',
-  '--color-brand1-6',
-  '--color-brand1-9',
-  '--color-brand1-10',
-]);
 const UNSAFE_THEME_PATTERNS = [
   { pattern: /<\/?script\b/i, message: '主题 CSS 不能包含 script 标签' },
   { pattern: /<\/?style\b/i, message: '主题 CSS 不能包含 style 标签' },
@@ -137,12 +129,12 @@ function normalizeThemeColor(value) {
 
 function extractThemeColor(cssText) {
   const source = String(cssText || '').replace(/\/\*[\s\S]*?\*\//g, '');
-  const match = source.match(/(?:^|[;{])\s*--color-brand1-6\s*:\s*([^;}\n]+)/i);
-  if (!match) {
+  const value = rootDeclarations(source)['--color-brand1-6'];
+  if (!value) {
     throw new Error('自定义主题文件必须声明 --color-brand1-6，CLI 会用它保存应用 themeColor');
   }
   try {
-    return normalizeThemeColor(match[1]);
+    return normalizeThemeColor(value);
   } catch (error) {
     throw new Error(`--color-brand1-6 必须是可直接保存的颜色值: ${error.message}`);
   }
@@ -159,6 +151,17 @@ function validateThemeCssContent(cssText) {
     });
   }
   const sourceWithoutComments = source.replace(/\/\*[\s\S]*?\*\//g, '');
+  // Custom properties accept arbitrary text. An authoring formula can therefore
+  // override a valid platform color yet invalidate every property consuming it;
+  // var() fallbacks do not rescue that case. Reject it before any upload.
+  for (const declaration of sourceWithoutComments.matchAll(/(?:^|[;{])\s*(--[\w-]+)\s*:\s*([^;]+)/g)) {
+    if (/\{\{[^}]+\}\}|<生成实际色值[：:]/.test(declaration[2])) {
+      throw new CliError(t('design_document.theme_css_unresolved', declaration[1]), {
+        code: 'THEME_CSS_UNRESOLVED_TOKEN',
+        details: { token: declaration[1], value: declaration[2].trim() },
+      });
+    }
+  }
   for (const rule of UNSAFE_THEME_PATTERNS) {
     if (rule.pattern.test(sourceWithoutComments)) {
       throw new Error(rule.message);
@@ -179,21 +182,20 @@ function validateThemeCssContent(cssText) {
     match = urlPattern.exec(sourceWithoutComments);
   }
 
-  const declaredTokens = new Set();
-  const declarationPattern = /(?:^|[;{])\s*(--color-brand1-(?:10|[1-9]))\s*:\s*([^;}\n]+)/gi;
-  let declaration = declarationPattern.exec(sourceWithoutComments);
-  while (declaration) {
-    if (declaration[2].trim()) {
-      declaredTokens.add(declaration[1].toLowerCase());
-    }
-    declaration = declarationPattern.exec(sourceWithoutComments);
-  }
-  const missingTokens = REQUIRED_BRAND_SCALE_TOKENS.filter((token) => !declaredTokens.has(token));
+  const tokens = rootDeclarations(sourceWithoutComments);
+  const missingTokens = REQUIRED_APPLICATION_BRAND_TOKENS.filter((token) => !(token in tokens));
   if (missingTokens.length > 0) {
-    throw new Error(
-      `自定义主题文件必须完整声明平台品牌色阶 ${REQUIRED_BRAND_SCALE_TOKENS.join('、')}，缺少: ${missingTokens.join(', ')}`
+    throw new CliError(
+      `自定义主题文件必须在顶层 :root 完整声明平台品牌色阶 ${REQUIRED_APPLICATION_BRAND_TOKENS.join('、')}，缺少: ${missingTokens.join(', ')}`,
+      { code: 'THEME_BRAND_SCALE_INCOMPLETE', details: { missingTokens, scope: ':root' } }
     );
   }
+  const issues = invalidBrandValues(tokens, normalizeThemeColor);
+  if (issues.length) {
+    throw new CliError(t('design_document.invalid', issues[0].token, issues[0].reason), {
+      code: 'THEME_BRAND_SCALE_INVALID', details: { issues, scope: ':root' },
+    });
+  }
 }
 
 function readThemeCssFile(filePath) {
@@ -300,6 +302,7 @@ async function uploadCustomThemeFile(appType, filePath, authRef, options = {}) {
 module.exports = {
   MAX_THEME_FILE_BYTES,
   REQUIRED_BRAND_SCALE_TOKENS,
+  REQUIRED_APPLICATION_BRAND_TOKENS,
   validateThemeCssContent,
   normalizeThemeColor,
   normalizeCssColorToHex,

package/lib/app/fix-theme.js

@@ -1,82 +1,34 @@
 'use strict';
 
-/**
- * fix-theme.js - Canvas 主题迁移 codemod（纯函数）
- *
- * 把写死在 antd `ConfigProvider` 里的品牌交互色覆盖（如 `colorPrimary: '#1677ff'`）
- * 从源码中移除，交由外层应用主题（CanvasThemeProvider / 平台主题）解析。这是
- * "un-pin" 迁移：移除硬编码覆盖后，品牌色由应用主题接管，正好满足主题守卫
- * `OPENYIDA_CANVAS_THEME_FIXED_BRAND` 的要求。
- *
- * 本模块不做任何 IO，只接收源码字符串、返回改写后的源码，便于单测与复用。
- */
-
+const Babel = require('@babel/standalone');
 const { collectFixedBrandViolations } = require('./canvas-theme-guard');
 
-/**
- * 计算某个对象属性的删除区间：优先连同其后的逗号一起删；若是最后一个属性，
- * 则回退删除其前的逗号。属性独占一行时顺带清理该行缩进与换行，避免留下空行。
- * @param {string} source
- * @param {number} start - 属性节点起始偏移
- * @param {number} end - 属性节点结束偏移
- * @returns {{ start: number, end: number }}
- */
-function expandRemovalSpan(source, start, end) {
-  let removeStart = start;
-  let removeEnd = end;
-  const trailing = source.slice(removeEnd).match(/^[ \t]*,/);
-  if (trailing) {
-    removeEnd += trailing[0].length;
-    const lineStart = source.lastIndexOf('\n', removeStart - 1) + 1;
-    const indent = source.slice(lineStart, removeStart);
-    if (/^[ \t]*$/.test(indent)) {
-      removeStart = lineStart;
-      const newline = source.slice(removeEnd).match(/^[ \t]*\r?\n/);
-      if (newline) { removeEnd += newline[0].length; }
-    }
-    return { start: removeStart, end: removeEnd };
-  }
-  // Last property in its object: drop the preceding comma instead.
-  const leading = source.slice(0, removeStart).match(/,[ \t\r\n]*$/);
-  if (leading) { removeStart -= leading[0].length; }
-  return { start: removeStart, end: removeEnd };
-}
-
-/**
- * 移除源码中写死的品牌色覆盖。改写按偏移从后往前应用，避免前面的偏移失效。
- * @param {string} source - canvas 源码
- * @returns {{ changed: boolean, output: string, violations: Array<{field:string,color:string,line:number}> }}
- */
+// Use parser tokens to remove separators without treating comments as syntax.
+// Preserve all other source text, including CSS and the maintained drawer/provider.
 function transformFixedBrandTheme(source) {
   const violations = collectFixedBrandViolations(source)
     .filter(item => Number.isInteger(item.start) && Number.isInteger(item.end) && item.end > item.start);
-  if (!violations.length) {
-    return { changed: false, output: source, violations: [] };
-  }
-  const spans = violations
-    .map(item => expandRemovalSpan(source, item.start, item.end))
-    .sort((a, b) => a.start - b.start);
-
-  // Adjacent overrides can claim the same separating comma (one as trailing,
-  // the next as leading), so merge overlapping spans instead of dropping one.
+  if (!violations.length) { return { changed: false, output: source, violations: [] }; }
+  const parse = value => Babel.packages.parser.parse(value, {
+    sourceType: 'module', plugins: ['jsx', 'typescript'], tokens: true,
+  });
+  const tokens = parse(source).tokens.filter(token => typeof token.type !== 'string');
+  const spans = violations.flatMap(({ start, end }) => {
+    const next = tokens.find(token => token.start >= end);
+    const previous = tokens.filter(token => token.end <= start).pop();
+    const comma = next?.type.label === ',' ? next : previous?.type.label === ',' ? previous : null;
+    return [{ start, end }, ...(comma ? [{ start: comma.start, end: comma.end }] : [])];
+  }).sort((a, b) => a.start - b.start);
   const merged = [];
   for (const span of spans) {
     const last = merged[merged.length - 1];
     if (last && span.start <= last.end) { last.end = Math.max(last.end, span.end); }
     else { merged.push({ ...span }); }
   }
-
   let output = source;
-  // Apply from the back so earlier offsets stay valid.
-  for (let i = merged.length - 1; i >= 0; i -= 1) {
-    output = output.slice(0, merged[i].start) + output.slice(merged[i].end);
-  }
-
-  return {
-    changed: output !== source,
-    output,
-    violations: violations.map(({ field, color, line }) => ({ field, color, line })),
-  };
+  for (const span of merged.reverse()) { output = output.slice(0, span.start) + output.slice(span.end); }
+  parse(output);
+  return { changed: output !== source, output, violations: violations.map(({ field, color, line }) => ({ field, color, line })) };
 }
 
-module.exports = { transformFixedBrandTheme, expandRemovalSpan };
+module.exports = { transformFixedBrandTheme };